Mercurial > emacs
changeset 108410:91a3b0edffcc
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sat, 06 Feb 2010 04:13:19 +0000 |
| parents | 75f6177a785f (current diff) 31db1aaeac2d (diff) |
| children | 8af8a20eebf0 |
| files | |
| diffstat | 8 files changed, 45 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Fri Feb 05 15:06:31 2010 +0000 +++ b/doc/misc/ChangeLog Sat Feb 06 04:13:19 2010 +0000 @@ -1,3 +1,7 @@ +2010-02-05 Mark A. Hershberger <mah@everybody.org> + + * ede.texi, eieio.texi, semantic.texi: Use standard direntry format. + 2010-01-21 Katsumi Yamaoka <yamaoka@jpl.org> * gnus.texi (Score File Format): Fix typo.
--- a/doc/misc/ede.texi Fri Feb 05 15:06:31 2010 +0000 +++ b/doc/misc/ede.texi Sat Feb 06 04:13:19 2010 +0000 @@ -22,13 +22,10 @@ @end quotation @end copying -@ifinfo -@format -START-INFO-DIR-ENTRY +@dircategory Emacs +@direntry * ede: (ede). Project management for Emacs -END-INFO-DIR-ENTRY -@end format -@end ifinfo +@end direntry @titlepage @center @titlefont{EDE (The Emacs Development Environment)}
--- a/doc/misc/eieio.texi Fri Feb 05 15:06:31 2010 +0000 +++ b/doc/misc/eieio.texi Sat Feb 06 04:13:19 2010 +0000 @@ -27,13 +27,10 @@ @end quotation @end copying -@ifinfo -@format -START-INFO-DIR-ENTRY +@dircategory Emacs +@direntry * eieio: (eieio). Objects for Emacs -END-INFO-DIR-ENTRY -@end format -@end ifinfo +@end direntry @titlepage @center @titlefont{@value{TITLE}}
--- a/doc/misc/semantic.texi Fri Feb 05 15:06:31 2010 +0000 +++ b/doc/misc/semantic.texi Sat Feb 06 04:13:19 2010 +0000 @@ -41,13 +41,10 @@ @end quotation @end copying -@ifinfo -@format -START-INFO-DIR-ENTRY +@dircategory Emacs +@direntry * Semantic: (semantic). Source code parser library and utilities. -END-INFO-DIR-ENTRY -@end format -@end ifinfo +@end direntry @titlepage @center @titlefont{Semantic}
--- a/lisp/ChangeLog Fri Feb 05 15:06:31 2010 +0000 +++ b/lisp/ChangeLog Sat Feb 06 04:13:19 2010 +0000 @@ -1,3 +1,13 @@ +2010-02-05 Juri Linkov <juri@jurta.org> + + * doc-view.el (doc-view-mode): + * image-mode.el (image-mode): Put property mode-class=special. + (Bug#4896) + +2010-02-05 Mark A. Hershberger <mah@everybody.org> + + * vc-svn.el (vc-svn-revision-table): New function. + 2010-02-05 Michael Albinus <michael.albinus@gmx.de> * net/ange-ftp.el (ange-ftp-insert-directory):
--- a/lisp/doc-view.el Fri Feb 05 15:06:31 2010 +0000 +++ b/lisp/doc-view.el Sat Feb 06 04:13:19 2010 +0000 @@ -1134,7 +1134,7 @@ ;;;; User interface commands and the mode -;; (put 'doc-view-mode 'mode-class 'special) +(put 'doc-view-mode 'mode-class 'special) (defun doc-view-already-converted-p () "Return non-nil if the current doc was already converted."
--- a/lisp/image-mode.el Fri Feb 05 15:06:31 2010 +0000 +++ b/lisp/image-mode.el Sat Feb 06 04:13:19 2010 +0000 @@ -317,6 +317,8 @@ (defvar bookmark-make-record-function) +(put 'image-mode 'mode-class 'special) + ;;;###autoload (defun image-mode () "Major mode for image files.
--- a/lisp/vc-svn.el Fri Feb 05 15:06:31 2010 +0000 +++ b/lisp/vc-svn.el Sat Feb 06 04:13:19 2010 +0000 @@ -31,6 +31,10 @@ (eval-when-compile (require 'vc)) +;; Clear up the cache to force vc-call to check again and discover +;; new functions when we reload this file. +(put 'SVN 'vc-functions nil) + ;;; ;;; Customization options ;;; @@ -722,6 +726,21 @@ (beginning-of-line) (if (looking-at vc-svn-annotate-re) (match-string 1)))) +(defun vc-svn-revision-table (files) + (let ((vc-svn-revisions '())) + (with-current-buffer "*vc*" + (vc-svn-command nil 0 files "log" "-q") + (goto-char (point-min)) + (forward-line) + (let ((start (point-min)) + (loglines (buffer-substring-no-properties (point-min) + (point-max)))) + (while (string-match "^r\\([0-9]+\\) " loglines) + (push (match-string 1 loglines) vc-svn-revisions) + (setq start (+ start (match-end 0))) + (setq loglines (buffer-substring-no-properties start (point-max))))) + vc-svn-revisions))) + (provide 'vc-svn) ;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d