mercurial-crew-with-dirclash: comparison contrib/mercurial.el

equal deleted inserted replaced

-:6dfc9cc71f42
+:ad6fcceaf59b
 ;;; mercurial.el --- Emacs support for the Mercurial distributed SCM
 ;; Copyright (C) 2005 Bryan O'Sullivan
 ;; Author: Bryan O'Sullivan <bos@serpentine.com>
-;; $Id$
 ;; mercurial.el is free software; you can redistribute it and/or
 ;; modify it under the terms of version 2 of the GNU General Public
 ;; License as published by the Free Software Foundation.
 ;; (`C-h C-l').  If not, write to the Free Software Foundation, Inc.,
 ;; 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;;; Commentary:
-;; This mode builds upon Emacs's VC mode to provide flexible
+;; mercurial.el builds upon Emacs's VC mode to provide flexible
 ;; integration with the Mercurial distributed SCM tool.
 ;; To get going as quickly as possible, load mercurial.el into Emacs and
 ;; type `C-c h h'; this runs hg-help-overview, which prints a helpful
 ;; usage overview.
 ;; Much of the inspiration for mercurial.el comes from Rajesh
 ;; Vaidheeswarran's excellent p4.el, which does an admirably thorough
 ;; job for the commercial Perforce SCM product.  In fact, substantial
 ;; chunks of code are adapted from p4.el.
-;; This code has been developed under XEmacs 21.5, and may will not
+;; This code has been developed under XEmacs 21.5, and may not work as
-;; work as well under GNU Emacs (albeit tested under 21.2).  Patches
+;; well under GNU Emacs (albeit tested under 21.4).  Patches to
-;; to enhance the portability of this code, fix bugs, and add features
+;; enhance the portability of this code, fix bugs, and add features
 ;; are most welcome.  You can clone a Mercurial repository for this
 ;; package from http://www.serpentine.com/hg/hg-emacs
 ;; Please send problem reports and suggestions to bos@serpentine.com.
 (find-file-other-window file))
 (rev
 (hg-diff hg-view-file-name rev rev prev-buf))
 ((message "I don't know how to do that yet")))))
+(defsubst hg-event-point (event)
+"Return the character position of the mouse event EVENT."
+(if hg-running-xemacs
+(event-point event)
+(posn-point (event-start event))))
+(defsubst hg-event-window (event)
+"Return the window over which mouse event EVENT occurred."
+(if hg-running-xemacs
+(event-window event)
+(posn-window (event-start event))))
 (defun hg-buffer-mouse-clicked (event)
 "Translate the mouse clicks in a HG log buffer to character events.
 These are then handed off to `hg-buffer-commands'.
 Handle frickin' frackin' gratuitous event-related incompatibilities."
 (interactive "e")
-(if hg-running-xemacs
+(select-window (hg-event-window event))
-(progn
+(hg-buffer-commands (hg-event-point event)))
-	(select-window (event-window event))
-	(hg-buffer-commands (event-point event)))
-(select-window (posn-window (event-end event)))
-(hg-buffer-commands (posn-point (event-start event)))))
 (unless (fboundp 'view-minor-mode)
 (defun view-minor-mode (prev-buffer exit-func)
 (view-mode)))
 "Toggle whether or not the file at POS will be committed."
 (interactive "d")
 (save-excursion
 (goto-char pos)
 (let ((face (get-text-property pos 'face))
+	  (inhibit-read-only t)
 	  bol)
 (beginning-of-line)
 (setq bol (+ (point) 4))
 (end-of-line)
 (if (eq face 'bold)
 		 (buffer-substring bol (point)))))))
 (defun hg-commit-mouse-clicked (event)
 "Toggle whether or not the file at POS will be committed."
 (interactive "@e")
-(hg-commit-toggle-file (event-point event)))
+(hg-commit-toggle-file (hg-event-point event)))
 (defun hg-commit-kill ()
 "Kill the commit currently being prepared."
 (interactive)
 (when (or (not (buffer-modified-p)) (y-or-n-p "Really kill this commit? "))
 	(set (make-local-variable 'hg-root) root)
 	(setq hg-prev-buffer prev-buffer)
 	(insert "\n")
 	(let ((bol (point)))
 	  (insert hg-commit-message-end)
-	  (add-text-properties bol (point) '(read-only t face bold-italic)))
+	  (add-text-properties bol (point) '(face bold-italic)))
 	(let ((file-area (point)))
 	  (insert modified-files)
 	  (goto-char file-area)
 	  (while (< (point) (point-max))
 	    (let ((bol (point)))
 	      (add-text-properties (+ bol 4) (point)
 				   '(face bold mouse-face highlight)))
 	    (forward-line 1))
 	  (goto-char file-area)
 	  (add-text-properties (point) (point-max)
-			       `(read-only t keymap ,hg-commit-mode-file-map))
+			       `(keymap ,hg-commit-mode-file-map))
 	  (goto-char (point-min))
 	  (insert hg-commit-message-start)
-	  (add-text-properties (point-min) (point)
+	  (add-text-properties (point-min) (point) '(face bold-italic))
-			       '(read-only t face bold-italic))
 	  (insert "\n\n")
 	  (forward-line -1)
+	  (save-excursion
+	    (goto-char (point-max))
+	    (search-backward hg-commit-message-end)
+	    (add-text-properties (match-beginning 0) (point-max)
+				 '(read-only t))
+	    (goto-char (point-min))
+	    (search-forward hg-commit-message-start)
+	    (add-text-properties (match-beginning 0) (match-end 0)
+				 '(read-only t)))
 	  (hg-commit-mode))))))
 (defun hg-diff (path &optional rev1 rev2)
 "Show the differences between REV1 and REV2 of PATH.
 When called interactively, the default behaviour is to treat REV1 as

changeset 1004	ad6fcceaf59b
parent 1003	6dfc9cc71f42
child 1011	d06420c90d8b