Now on revision 106920. ------------------------------------------------------------ revno: 106920 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-01-23 11:44:28 -0800 message: Spelling fix. diff: === modified file 'lisp/files.el' --- lisp/files.el 2012-01-21 00:41:05 +0000 +++ lisp/files.el 2012-01-23 19:44:28 +0000 @@ -3779,7 +3779,7 @@ ;; Don't change the mode if the local variable list specifies it. ;; The file name can influence whether the local variables apply. (and old-try-locals - ;; h-l-v also checks it, but might as well be explcit. + ;; h-l-v also checks it, but might as well be explicit. (not (inhibit-local-variables-p)) (hack-local-variables t)) ;; TODO consider making normal-mode handle this case. ------------------------------------------------------------ revno: 106919 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-23 00:45:59 -0800 message: Replace vc-dired references in comments with vc-dir. diff: === modified file 'lisp/vc/pcvs.el' --- lisp/vc/pcvs.el 2012-01-19 07:21:25 +0000 +++ lisp/vc/pcvs.el 2012-01-23 08:45:59 +0000 @@ -31,19 +31,19 @@ ;;; Commentary: -;; PCL-CVS is a front-end to the CVS version control system. For people -;; familiar with VC, it is somewhat like VC-dired: it presents the status of -;; all the files in your working area and allows you to commit/update several -;; of them at a time. Compared to VC-dired, it is considerably better and -;; faster (but only for CVS). +;; PCL-CVS is a front-end to the CVS version control system. +;; It presents the status of all the files in your working area and +;; allows you to commit/update several of them at a time. +;; Compare with the general Emacs utility vc-dir, which tries +;; to be VCS-agnostic. You may find PCL-CVS better/faster for CVS. ;; PCL-CVS was originally written by Per Cederqvist many years ago. This ;; version derives from the XEmacs-21 version, itself based on the 2.0b2 ;; version (last release from Per). It is a thorough rework. -;; Contrary to what you'd expect, PCL-CVS is not a replacement for VC but only -;; for VC-dired. As such, I've tried to make PCL-CVS and VC interoperate -;; seamlessly (I also use VC). +;; PCL-CVS is not a replacement for VC, but adds extra functionality. +;; As such, I've tried to make PCL-CVS and VC interoperate seamlessly +;; (I also use VC). ;; To use PCL-CVS just use `M-x cvs-examine RET RET'. ;; There is a TeXinfo manual, which can be helpful to get started. === modified file 'lisp/vc/vc-dav.el' --- lisp/vc/vc-dav.el 2012-01-19 07:21:25 +0000 +++ lisp/vc/vc-dav.el 2012-01-23 08:45:59 +0000 @@ -170,10 +170,7 @@ ;; Return a dav-specific mode line string for URL. Are there any ;; specific states that we want exposed? ;; -;; vc-dav-dired-state-info(url) -;; Translate the `vc-state' property of URL into a string that can -;; be used in a vc-dired buffer. Are there any extra states that -;; we want exposed? +;; vc-dir support ;; ;; vc-dav-receive-file(url rev) ;; Let this backend `receive' a file that is already registered ------------------------------------------------------------ revno: 106918 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-23 00:38:22 -0800 message: * pcl-cvs.texi (About PCL-CVS): Refer to vc-dir rather than vc-dired. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-01-20 20:12:38 +0000 +++ doc/misc/ChangeLog 2012-01-23 08:38:22 +0000 @@ -1,3 +1,7 @@ +2012-01-23 Glenn Morris + + * pcl-cvs.texi (About PCL-CVS): Refer to vc-dir rather than vc-dired. + 2012-01-19 Eric Hanchrow * tramp.texi (File): Tweak wording for the `scpc' option. === modified file 'doc/misc/pcl-cvs.texi' --- doc/misc/pcl-cvs.texi 2012-01-19 07:21:25 +0000 +++ doc/misc/pcl-cvs.texi 2012-01-23 08:38:22 +0000 @@ -6,8 +6,7 @@ @c %**end of header @copying -Copyright @copyright{} 1991-2012 -Free Software Foundation, Inc. +Copyright @copyright{} 1991-2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -136,10 +135,9 @@ PCL-CVS is a front-end to CVS versions 1.9 and later. It concisely shows the present status of a checked out module in an Emacs buffer and provides single-key access to the most frequently used CVS -commands. -For Emacs users accustomed to VC, PCL-CVS can be thought of as a replacement -for VC-dired (@pxref{VC Directory Mode, , , emacs, The GNU -Emacs Manual}) specifically designed for CVS. +commands. Note that the @code{vc-dir} command (@pxref{VC Directory +Mode, , , emacs, The GNU Emacs Manual}) provides similar +functionality, but for several version control systems, including CVS. PCL-CVS was originally written many years ago by Per Cederqvist who proudly maintained it until January 1996, at which point he released the ------------------------------------------------------------ revno: 106917 fixes bug(s): http://debbugs.gnu.org/10548 author: Mike Lamb committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-23 00:18:22 -0800 message: * lisp/eshell/esh-util.el (pcomplete/ssh): Remove alias. (tiny change) There is a better pcomplete/ssh defined in pcmpl-unix.el. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-01-23 08:12:10 +0000 +++ lisp/ChangeLog 2012-01-23 08:18:22 +0000 @@ -3,6 +3,8 @@ * eshell/esh-util.el (eshell-read-hosts-file): Skip comment lines. (Bug#10549) + * eshell/em-unix.el (pcomplete/ssh): Remove. (Bug#10548) + 2012-01-23 Juanma Barranquero * subr.el (display-delayed-warnings): Doc fix. === modified file 'lisp/eshell/em-unix.el' --- lisp/eshell/em-unix.el 2012-01-19 07:21:25 +0000 +++ lisp/eshell/em-unix.el 2012-01-23 08:18:22 +0000 @@ -792,8 +792,6 @@ (funcall (or (pcomplete-find-completion-function (pcomplete-arg 1)) pcomplete-default-completion-function))) -(defalias 'pcomplete/ssh 'pcomplete/rsh) - (defvar block-size) (defvar by-bytes) (defvar dereference-links) ------------------------------------------------------------ revno: 106916 fixes bug(s): http://debbugs.gnu.org/10549 author: Mike Lamb committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-23 00:12:10 -0800 message: Handle comments in eshell-read-hosts-file (tiny change) * lisp/eshell/esh-util.el (eshell-read-hosts-file): Skip comment lines. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-01-23 02:10:36 +0000 +++ lisp/ChangeLog 2012-01-23 08:12:10 +0000 @@ -1,3 +1,8 @@ +2012-01-23 Mike Lamb (tiny change) + + * eshell/esh-util.el (eshell-read-hosts-file): + Skip comment lines. (Bug#10549) + 2012-01-23 Juanma Barranquero * subr.el (display-delayed-warnings): Doc fix. === modified file 'lisp/eshell/esh-util.el' --- lisp/eshell/esh-util.el 2012-01-19 07:21:25 +0000 +++ lisp/eshell/esh-util.el 2012-01-23 08:12:10 +0000 @@ -483,7 +483,7 @@ (insert-file-contents eshell-hosts-file) (goto-char (point-min)) (while (re-search-forward - "^\\(\\S-+\\)\\s-+\\(\\S-+\\)\\(\\s-*\\(\\S-+\\)\\)?" nil t) + "^\\([^#[:space:]]+\\)\\s-+\\(\\S-+\\)\\(\\s-*\\(\\S-+\\)\\)?" nil t) (if (match-string 1) (add-to-list 'hosts (match-string 1))) (if (match-string 2) ------------------------------------------------------------ revno: 106915 committer: Chong Yidong branch nick: trunk timestamp: Mon 2012-01-23 14:54:20 +0800 message: Fix last change. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-01-23 06:52:18 +0000 +++ doc/emacs/ChangeLog 2012-01-23 06:54:20 +0000 @@ -1,6 +1,6 @@ 2012-01-23 Chong Yidong - * anti.texi (Antinews): Add Emacs 24 antinews. + * anti.texi (Antinews): Add Emacs 23 antinews. 2012-01-16 Volker Sobek (tiny change)