Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 104241. ------------------------------------------------------------ revno: 104241 committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-05-15 11:51:21 -0700 message: * lisp/vc/diff-mode.el: Fix paren typo. diff: === modified file 'lisp/vc/diff-mode.el' --- lisp/vc/diff-mode.el 2011-05-15 14:09:43 +0000 +++ lisp/vc/diff-mode.el 2011-05-15 18:51:21 +0000 @@ -1118,47 +1118,47 @@ (save-excursion (goto-char end) (diff-end-of-hunk nil 'donttrustheader) (let ((plus 0) (minus 0) (space 0) (bang 0)) - while (and (= (forward-line -1) 0) (<= start (point))) - (if (not (looking-at - (concat diff-hunk-header-re-unified - "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$" - "\\|--- .+\n\\+\\+\\+ "))) - (case (char-after) - (?\s (incf space)) - (?+ (incf plus)) - (?- (incf minus)) - (?! (incf bang)) - ((?\\ ?#) nil) - (t (setq space 0 plus 0 minus 0 bang 0))) - (cond - ((looking-at diff-hunk-header-re-unified) - (let* ((old1 (match-string 2)) - (old2 (match-string 4)) - (new1 (number-to-string (+ space minus))) - (new2 (number-to-string (+ space plus)))) - (if old2 - (unless (string= new2 old2) (replace-match new2 t t nil 4)) - (goto-char (match-end 3)) - (insert "," new2)) - (if old1 - (unless (string= new1 old1) (replace-match new1 t t nil 2)) - (goto-char (match-end 1)) - (insert "," new1)))) - ((looking-at diff-context-mid-hunk-header-re) - (when (> (+ space bang plus) 0) - (let* ((old1 (match-string 1)) - (old2 (match-string 2)) - (new (number-to-string - (+ space bang plus -1 (string-to-number old1))))) - (unless (string= new old2) (replace-match new t t nil 2))))) - ((looking-at "\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]*\\) \\*\\*\\*\\*$") - (when (> (+ space bang minus) 0) - (let* ((old (match-string 1)) - (new (format - (concat "%0" (number-to-string (length old)) "d") - (+ space bang minus -1 (string-to-number old))))) - (unless (string= new old) (replace-match new t t nil 2)))))) - (setq space 0 plus 0 minus 0 bang 0))))))) + (while (and (= (forward-line -1) 0) (<= start (point))) + (if (not (looking-at + (concat diff-hunk-header-re-unified + "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$" + "\\|--- .+\n\\+\\+\\+ "))) + (case (char-after) + (?\s (incf space)) + (?+ (incf plus)) + (?- (incf minus)) + (?! (incf bang)) + ((?\\ ?#) nil) + (t (setq space 0 plus 0 minus 0 bang 0))) + (cond + ((looking-at diff-hunk-header-re-unified) + (let* ((old1 (match-string 2)) + (old2 (match-string 4)) + (new1 (number-to-string (+ space minus))) + (new2 (number-to-string (+ space plus)))) + (if old2 + (unless (string= new2 old2) (replace-match new2 t t nil 4)) + (goto-char (match-end 3)) + (insert "," new2)) + (if old1 + (unless (string= new1 old1) (replace-match new1 t t nil 2)) + (goto-char (match-end 1)) + (insert "," new1)))) + ((looking-at diff-context-mid-hunk-header-re) + (when (> (+ space bang plus) 0) + (let* ((old1 (match-string 1)) + (old2 (match-string 2)) + (new (number-to-string + (+ space bang plus -1 (string-to-number old1))))) + (unless (string= new old2) (replace-match new t t nil 2))))) + ((looking-at "\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]*\\) \\*\\*\\*\\*$") + (when (> (+ space bang minus) 0) + (let* ((old (match-string 1)) + (new (format + (concat "%0" (number-to-string (length old)) "d") + (+ space bang minus -1 (string-to-number old))))) + (unless (string= new old) (replace-match new t t nil 2)))))) + (setq space 0 plus 0 minus 0 bang 0))))))) ;;;; ;;;; Hooks ------------------------------------------------------------ revno: 104240 committer: Chong Yidong branch nick: trunk timestamp: Sun 2011-05-15 10:09:43 -0400 message: Fix minor bug of diff-fixup-modifs on small diffs (Bug#8672). * vc/diff-mode.el (diff-fixup-modifs): Locate correct position for hunk-end tags. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-15 13:47:56 +0000 +++ lisp/ChangeLog 2011-05-15 14:09:43 +0000 @@ -1,5 +1,8 @@ 2011-05-15 Chong Yidong + * vc/diff-mode.el (diff-fixup-modifs): Locate correct position for + hunk-end tags (Bug#8672). + * vc/vc-annotate.el (vc-annotate-mode-map): Bind = to vc-annotate-show-diff-revision-at-line (Bug#8671). === modified file 'lisp/vc/diff-mode.el' --- lisp/vc/diff-mode.el 2011-05-06 04:07:47 +0000 +++ lisp/vc/diff-mode.el 2011-05-15 14:09:43 +0000 @@ -1118,45 +1118,47 @@ (save-excursion (goto-char end) (diff-end-of-hunk nil 'donttrustheader) (let ((plus 0) (minus 0) (space 0) (bang 0)) - (while (and (= (forward-line -1) 0) (<= start (point))) - (if (not (looking-at - (concat diff-hunk-header-re-unified - "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$" - "\\|--- .+\n\\+\\+\\+ "))) - (case (char-after) - (?\s (incf space)) - (?+ (incf plus)) - (?- (incf minus)) - (?! (incf bang)) - ((?\\ ?#) nil) - (t (setq space 0 plus 0 minus 0 bang 0))) - (cond - ((looking-at diff-hunk-header-re-unified) - (let* ((old1 (match-string 2)) - (old2 (match-string 4)) - (new1 (number-to-string (+ space minus))) - (new2 (number-to-string (+ space plus)))) - (if old2 - (unless (string= new2 old2) (replace-match new2 t t nil 4)) - (goto-char (match-end 4)) (insert "," new2)) - (if old1 - (unless (string= new1 old1) (replace-match new1 t t nil 2)) - (goto-char (match-end 2)) (insert "," new1)))) - ((looking-at diff-context-mid-hunk-header-re) - (when (> (+ space bang plus) 0) - (let* ((old1 (match-string 1)) - (old2 (match-string 2)) - (new (number-to-string - (+ space bang plus -1 (string-to-number old1))))) - (unless (string= new old2) (replace-match new t t nil 2))))) - ((looking-at "\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]*\\) \\*\\*\\*\\*$") - (when (> (+ space bang minus) 0) - (let* ((old (match-string 1)) - (new (format - (concat "%0" (number-to-string (length old)) "d") - (+ space bang minus -1 (string-to-number old))))) - (unless (string= new old) (replace-match new t t nil 2)))))) - (setq space 0 plus 0 minus 0 bang 0))))))) + while (and (= (forward-line -1) 0) (<= start (point))) + (if (not (looking-at + (concat diff-hunk-header-re-unified + "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$" + "\\|--- .+\n\\+\\+\\+ "))) + (case (char-after) + (?\s (incf space)) + (?+ (incf plus)) + (?- (incf minus)) + (?! (incf bang)) + ((?\\ ?#) nil) + (t (setq space 0 plus 0 minus 0 bang 0))) + (cond + ((looking-at diff-hunk-header-re-unified) + (let* ((old1 (match-string 2)) + (old2 (match-string 4)) + (new1 (number-to-string (+ space minus))) + (new2 (number-to-string (+ space plus)))) + (if old2 + (unless (string= new2 old2) (replace-match new2 t t nil 4)) + (goto-char (match-end 3)) + (insert "," new2)) + (if old1 + (unless (string= new1 old1) (replace-match new1 t t nil 2)) + (goto-char (match-end 1)) + (insert "," new1)))) + ((looking-at diff-context-mid-hunk-header-re) + (when (> (+ space bang plus) 0) + (let* ((old1 (match-string 1)) + (old2 (match-string 2)) + (new (number-to-string + (+ space bang plus -1 (string-to-number old1))))) + (unless (string= new old2) (replace-match new t t nil 2))))) + ((looking-at "\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]*\\) \\*\\*\\*\\*$") + (when (> (+ space bang minus) 0) + (let* ((old (match-string 1)) + (new (format + (concat "%0" (number-to-string (length old)) "d") + (+ space bang minus -1 (string-to-number old))))) + (unless (string= new old) (replace-match new t t nil 2)))))) + (setq space 0 plus 0 minus 0 bang 0))))))) ;;;; ;;;; Hooks ------------------------------------------------------------ revno: 104239 committer: Chong Yidong branch nick: trunk timestamp: Sun 2011-05-15 09:47:56 -0400 message: Bind = to diff command in vc-annotate mode (Bug#8671) * lisp/vc/vc-annotate.el (vc-annotate-mode-map): Bind = to vc-annotate-show-diff-revision-at-line. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-14 23:58:25 +0000 +++ lisp/ChangeLog 2011-05-15 13:47:56 +0000 @@ -1,3 +1,8 @@ +2011-05-15 Chong Yidong + + * vc/vc-annotate.el (vc-annotate-mode-map): Bind = to + vc-annotate-show-diff-revision-at-line (Bug#8671). + 2011-05-14 Glenn Morris * vc/add-log.el (add-change-log-entry): Don't start adding a new entry === modified file 'lisp/vc/vc-annotate.el' --- lisp/vc/vc-annotate.el 2011-04-24 19:37:47 +0000 +++ lisp/vc/vc-annotate.el 2011-05-15 13:47:56 +0000 @@ -120,6 +120,7 @@ (let ((m (make-sparse-keymap))) (define-key m "a" 'vc-annotate-revision-previous-to-line) (define-key m "d" 'vc-annotate-show-diff-revision-at-line) + (define-key m "=" 'vc-annotate-show-diff-revision-at-line) (define-key m "D" 'vc-annotate-show-changeset-diff-revision-at-line) (define-key m "f" 'vc-annotate-find-revision-at-line) (define-key m "j" 'vc-annotate-revision-at-line) ------------------------------------------------------------ revno: 104238 committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-05-15 06:19:52 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-05-10 10:18:34 +0000 +++ autogen/configure 2011-05-15 10:19:52 +0000 @@ -11395,9 +11395,11 @@ elif test x"${USE_X_TOOLKIT}" = xLUCID; then as_fn_error "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; do not use toolkit by default" >&5 -$as_echo "no; do not use toolkit by default" >&6; } - USE_X_TOOLKIT=none + as_fn_error "No X toolkit could be found. +If you are sure you want Emacs compiled without an X toolkit, pass + --with-x-toolkit=no +to configure. Otherwise, install the development libraries for the toolkit +that you want to use (e.g. Gtk+) and re-run configure." "$LINENO" 5 fi fi fi ------------------------------------------------------------ revno: 104237 committer: Glenn Morris branch nick: trunk timestamp: Sat 2011-05-14 16:58:25 -0700 message: add-log font-lock fix for mutilple authors (bug#8644) * lisp/vc/add-log.el (change-log-font-lock-keywords): Also handle multiple author lines with leading tabs. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-14 23:27:09 +0000 +++ lisp/ChangeLog 2011-05-14 23:58:25 +0000 @@ -2,6 +2,8 @@ * vc/add-log.el (add-change-log-entry): Don't start adding a new entry in the middle of an existing one with multiple authors. (Bug#8645) + (change-log-font-lock-keywords): Also handle multiple author lines + with leading tabs. (Bug#8644) * calendar/appt.el (appt-check): Rename some local variables. Some simplification/reordering. === modified file 'lisp/vc/add-log.el' --- lisp/vc/add-log.el 2011-05-14 23:27:09 +0000 +++ lisp/vc/add-log.el 2011-05-14 23:58:25 +0000 @@ -241,7 +241,7 @@ ;; wrongly with a non-date line existing as a random note. In ;; addition, using any kind of fixed setting like this doesn't ;; work if a user customizes add-log-time-format. - ("^[0-9-]+ +\\|^ \\{11,\\}\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+" + ("^[0-9-]+ +\\|^ \\{11,\\}\\|^\t \\{3,\\}\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+" (0 'change-log-date-face) ;; Name and e-mail; some people put e-mail in parens, not angles. ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil