Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99459. ------------------------------------------------------------ revno: 99459 committer: Dan Nicolaescu branch nick: trunk timestamp: Fri 2010-02-05 20:23:59 -0800 message: * vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-05 22:36:20 +0000 +++ lisp/ChangeLog 2010-02-06 04:23:59 +0000 @@ -1,3 +1,7 @@ +2010-02-06 Dan Nicolaescu + + * vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header. + 2010-02-05 Juri Linkov * doc-view.el (doc-view-mode): === modified file 'lisp/vc-bzr.el' --- lisp/vc-bzr.el 2010-02-01 04:58:35 +0000 +++ lisp/vc-bzr.el 2010-02-06 04:23:59 +0000 @@ -796,8 +796,12 @@ (shelve-help-echo "Use M-x vc-bzr-shelve to create shelves") (root-dir (vc-bzr-root dir)) (pending-merge - (file-exists-p - (expand-file-name ".bzr/checkout/merge-hashes" root-dir))) + ;; FIXME: looking for .bzr/checkout/merge-hashes is not a + ;; reliable method to detect pending merges, disable this + ;; until a proper solution is implemented. + (and nil + (file-exists-p + (expand-file-name ".bzr/checkout/merge-hashes" root-dir)))) (pending-merge-help-echo (format "A merge has been performed.\nA commit from the top-level directory (%s)\nis required before being able to check in anything else" root-dir)) (light-checkout ------------------------------------------------------------ revno: 99458 committer: Juri Linkov branch nick: trunk timestamp: Sat 2010-02-06 00:36:20 +0200 message: * doc-view.el (doc-view-mode): * image-mode.el (image-mode): Put property mode-class=special. (Bug#4896) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-05 19:20:17 +0000 +++ lisp/ChangeLog 2010-02-05 22:36:20 +0000 @@ -1,3 +1,9 @@ +2010-02-05 Juri Linkov + + * doc-view.el (doc-view-mode): + * image-mode.el (image-mode): Put property mode-class=special. + (Bug#4896) + 2010-02-05 Mark A. Hershberger * vc-svn.el (vc-svn-revision-table): New function. === modified file 'lisp/doc-view.el' --- lisp/doc-view.el 2010-02-05 01:53:40 +0000 +++ lisp/doc-view.el 2010-02-05 22:36:20 +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." === modified file 'lisp/image-mode.el' --- lisp/image-mode.el 2010-01-13 08:35:10 +0000 +++ lisp/image-mode.el 2010-02-05 22:36:20 +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. ------------------------------------------------------------ revno: 99457 committer: Mark A. Hershberger branch nick: local timestamp: Fri 2010-02-05 14:20:17 -0500 message: add primative implementation of vc-svn-revision-table diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-05 11:15:28 +0000 +++ lisp/ChangeLog 2010-02-05 19:20:17 +0000 @@ -1,3 +1,7 @@ +2010-02-05 Mark A. Hershberger + + * vc-svn.el (vc-svn-revision-table): New function. + 2010-02-05 Michael Albinus * net/ange-ftp.el (ange-ftp-insert-directory): === modified file 'lisp/vc-svn.el' --- lisp/vc-svn.el 2010-01-28 05:54:48 +0000 +++ lisp/vc-svn.el 2010-02-05 19:20:17 +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 ------------------------------------------------------------ revno: 99456 committer: Mark A. Hershberger branch nick: local timestamp: Fri 2010-02-05 14:09:38 -0500 message: forgot changelog entry diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-01-28 08:58:10 +0000 +++ doc/misc/ChangeLog 2010-02-05 19:09:38 +0000 @@ -1,3 +1,7 @@ +2010-02-05 Mark A. Hershberger + + * ede.texi, eieio.texi, semantic.texi: Use standard direntry format. + 2010-01-21 Katsumi Yamaoka * gnus.texi (Score File Format): Fix typo. ------------------------------------------------------------ revno: 99455 committer: Mark A. Hershberger branch nick: local timestamp: Fri 2010-02-05 14:05:33 -0500 message: Use standard format for direntry diff: === modified file 'doc/misc/ede.texi' --- doc/misc/ede.texi 2010-01-17 02:22:44 +0000 +++ doc/misc/ede.texi 2010-02-05 19:05:33 +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)} === modified file 'doc/misc/eieio.texi' --- doc/misc/eieio.texi 2010-01-30 21:58:56 +0000 +++ doc/misc/eieio.texi 2010-02-05 19:05:33 +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}} === modified file 'doc/misc/semantic.texi' --- doc/misc/semantic.texi 2010-01-17 19:50:24 +0000 +++ doc/misc/semantic.texi 2010-02-05 19:05:33 +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} ------------------------------------------------------------ revno: 99454 committer: Michael Albinus branch nick: trunk timestamp: Fri 2010-02-05 12:15:28 +0100 message: * net/ange-ftp.el (ange-ftp-insert-directory): * net/tramp-imap.el (tramp-imap-handle-insert-directory): * net/tramp-smb.el (tramp-smb-handle-insert-directory): Handle also directories. (Bug#5478) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-05 08:12:08 +0000 +++ lisp/ChangeLog 2010-02-05 11:15:28 +0000 @@ -1,3 +1,10 @@ +2010-02-05 Michael Albinus + + * net/ange-ftp.el (ange-ftp-insert-directory): + * net/tramp-imap.el (tramp-imap-handle-insert-directory): + * net/tramp-smb.el (tramp-smb-handle-insert-directory): + Handle also directories. (Bug#5478) + 2010-02-05 Glenn Morris * progmodes/f90.el (f90-font-lock-keywords-2): Fix `enum'. === modified file 'lisp/net/ange-ftp.el' --- lisp/net/ange-ftp.el 2010-02-03 06:16:34 +0000 +++ lisp/net/ange-ftp.el 2010-02-05 11:15:28 +0000 @@ -4533,9 +4533,10 @@ (when (string-match "-?d\\'" switches) ;; Remove "d" which dired added to `switches'. (setq switches (substring switches 0 (match-beginning 0)))) + (setq file (directory-file-name file)) (let* ((dirlist (ange-ftp-ls (or (file-name-directory file) ".") switches 'parse)) - (filename (file-name-nondirectory (directory-file-name file))) + (filename (file-name-nondirectory file)) (case-fold-search nil)) ;; FIXME: This presumes a particular output format, which is ;; basically Unix. === modified file 'lisp/net/tramp-imap.el' --- lisp/net/tramp-imap.el 2010-02-04 16:25:57 +0000 +++ lisp/net/tramp-imap.el 2010-02-05 11:15:28 +0000 @@ -395,9 +395,10 @@ (filename switches &optional wildcard full-directory-p) "Like `insert-directory' for Tramp files." (setq filename (expand-file-name filename)) - (when full-directory-p - ;; Called from `dired-add-entry'. - (setq filename (file-name-as-directory filename))) + (if full-directory-p + ;; Called from `dired-add-entry'. + (setq filename (file-name-as-directory filename)) + (setq filename (directory-file-name filename))) (with-parsed-tramp-file-name filename nil (save-match-data (let ((base (file-name-nondirectory localname)) @@ -479,7 +480,8 @@ (insert (format "%s\n" - (file-relative-name (expand-file-name (nth 0 x) filename)))) + (file-relative-name + (expand-file-name (nth 0 x) (file-name-directory filename))))) (put-text-property pos (1- (point)) 'dired-filename t)) (forward-line) (beginning-of-line))) === modified file 'lisp/net/tramp-smb.el' --- lisp/net/tramp-smb.el 2010-02-04 16:25:57 +0000 +++ lisp/net/tramp-smb.el 2010-02-05 11:15:28 +0000 @@ -651,9 +651,10 @@ (filename switches &optional wildcard full-directory-p) "Like `insert-directory' for Tramp files." (setq filename (expand-file-name filename)) - (when full-directory-p - ;; Called from `dired-add-entry'. - (setq filename (file-name-as-directory filename))) + (if full-directory-p + ;; Called from `dired-add-entry'. + (setq filename (file-name-as-directory filename)) + (setq filename (directory-file-name filename))) (with-parsed-tramp-file-name filename nil (save-match-data (let ((base (file-name-nondirectory filename)) @@ -715,8 +716,7 @@ (let ((attr (when (tramp-smb-get-stat-capability v) (ignore-errors - (file-attributes - (expand-file-name (nth 0 x) filename) 'string))))) + (file-attributes filename 'string))))) (insert (format "%10s %3d %-8s %-8s %8s %s " @@ -739,7 +739,9 @@ (insert (format "%s\n" - (file-relative-name (expand-file-name (nth 0 x) filename)))) + (file-relative-name + (expand-file-name + (nth 0 x) (file-name-directory filename))))) (put-text-property start (1- (point)) 'dired-filename t)) (forward-line) (beginning-of-line)))) ------------------------------------------------------------ revno: 99453 committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-02-05 00:12:08 -0800 message: * progmodes/f90.el (f90-font-lock-keywords-2): Fix `enum'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-05 04:49:36 +0000 +++ lisp/ChangeLog 2010-02-05 08:12:08 +0000 @@ -1,3 +1,7 @@ +2010-02-05 Glenn Morris + + * progmodes/f90.el (f90-font-lock-keywords-2): Fix `enum'. + 2010-02-05 Chong Yidong * startup.el (command-line-1): Convert options beginning with a === modified file 'lisp/progmodes/f90.el' --- lisp/progmodes/f90.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/f90.el 2010-02-05 08:12:08 +0000 @@ -558,9 +558,8 @@ \\(function\\)\\>[ \t]*\\(\\sw+\\)[ \t]*\\(([^&!\n]*)\\)" (1 font-lock-type-face t) (4 font-lock-keyword-face t) (5 font-lock-function-name-face t) (6 'default t)) - ;; enum (F2003; cf type in -1). - '("\\<\\(enum\\)\\>\\([^()\n]*::\\)?[ \t]*\\(\\sw+\\)" - (1 font-lock-keyword-face) (3 font-lock-function-name-face)) + ;; enum (F2003; must be followed by ", bind(C)"). + '("\\<\\(enum\\)[ \t]*," (1 font-lock-keyword-face)) ;; end do, enum (F2003), if, select, where, and forall constructs. '("\\<\\(end[ \t]*\\(do\\|if\\|enum\\|select\\|forall\\|where\\)\\)\\>\ \\([ \t]+\\(\\sw+\\)\\)?" ------------------------------------------------------------ revno: 99452 committer: Chong Yidong branch nick: trunk timestamp: Thu 2010-02-04 23:49:36 -0500 message: Fix 2009-02-20 change to startup.el (Bug#5519). * startup.el (command-line-1): Convert options beginning with a single dash as well (Bug#5519). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-05 04:21:11 +0000 +++ lisp/ChangeLog 2010-02-05 04:49:36 +0000 @@ -1,3 +1,8 @@ +2010-02-05 Chong Yidong + + * startup.el (command-line-1): Convert options beginning with a + single dash as well (Bug#5519). + 2010-02-05 Stefan Monnier Make `initials' completion work for /hh -> /home/horn again (bug#5524). === modified file 'lisp/startup.el' --- lisp/startup.el 2010-01-16 19:28:59 +0000 +++ lisp/startup.el 2010-02-05 04:49:36 +0000 @@ -2103,7 +2103,7 @@ (when (string-match "\\`\\(--[^=]*\\)=" argi) (setq argval (substring argi (match-end 0)) argi (match-string 1 argi))) - (when (string-match "\\`--." orig-argi) + (when (string-match "\\`--?[^-]" orig-argi) (setq completion (try-completion argi longopts)) (if (eq completion t) (setq argi (substring argi 1))