Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99438. ------------------------------------------------------------ revno: 99438 committer: Michael Albinus branch nick: trunk timestamp: Wed 2010-02-03 07:16:34 +0100 message: * net/ange-ftp.el (ange-ftp-insert-directory): Parse directory also in case of (and (not full) (not wildcard)). This is needed, when dired is called with a list of files, which are not in `default-directory'. (Bug#5478) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-03 03:55:03 +0000 +++ lisp/ChangeLog 2010-02-03 06:16:34 +0000 @@ -1,3 +1,10 @@ +2010-02-03 Michael Albinus + + * net/ange-ftp.el (ange-ftp-insert-directory): Parse directory + also in case of (and (not full) (not wildcard)). This is needed, + when dired is called with a list of files, which are not in + `default-directory'. (Bug#5478) + 2010-02-03 Stefan Monnier * vc-hooks.el (vc-path): Make it an obsolete var, rather than function. === modified file 'lisp/net/ange-ftp.el' --- lisp/net/ange-ftp.el 2010-02-02 11:19:36 +0000 +++ lisp/net/ange-ftp.el 2010-02-03 06:16:34 +0000 @@ -4534,7 +4534,7 @@ ;; Remove "d" which dired added to `switches'. (setq switches (substring switches 0 (match-beginning 0)))) (let* ((dirlist (ange-ftp-ls (or (file-name-directory file) ".") - switches nil)) + switches 'parse)) (filename (file-name-nondirectory (directory-file-name file))) (case-fold-search nil)) ;; FIXME: This presumes a particular output format, which is ------------------------------------------------------------ revno: 99437 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2010-02-02 22:55:03 -0500 message: (vc-path): Make it an obsolete var, rather than function. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-02 22:33:52 +0000 +++ lisp/ChangeLog 2010-02-03 03:55:03 +0000 @@ -1,3 +1,7 @@ +2010-02-03 Stefan Monnier + + * vc-hooks.el (vc-path): Make it an obsolete var, rather than function. + 2010-02-02 Juri Linkov * textmodes/ispell.el (ispell-message-text-end): Remove final newline === modified file 'lisp/vc-hooks.el' --- lisp/vc-hooks.el 2010-01-26 07:22:25 +0000 +++ lisp/vc-hooks.el 2010-02-03 03:55:03 +0000 @@ -89,7 +89,7 @@ :type '(repeat directory) :group 'vc) -(make-obsolete 'vc-path "should not be necessary anymore." "23.2") +(make-obsolete-variable 'vc-path "should not be necessary anymore." "23.2") (defcustom vc-make-backup-files nil "If non-nil, backups of registered files are made as with other files. ------------------------------------------------------------ revno: 99436 committer: Juri Linkov branch nick: trunk timestamp: Wed 2010-02-03 00:33:52 +0200 message: * textmodes/ispell.el (ispell-message-text-end): Remove final newline from unidiff to allow function-line after @@. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-02 22:28:57 +0000 +++ lisp/ChangeLog 2010-02-02 22:33:52 +0000 @@ -1,5 +1,10 @@ 2010-02-02 Juri Linkov + * textmodes/ispell.el (ispell-message-text-end): Remove final newline + from unidiff to allow function-line after @@. + +2010-02-02 Juri Linkov + * ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by '(RCS SCCS) with inverted condition. === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2010-01-14 18:59:31 +0000 +++ lisp/textmodes/ispell.el 2010-02-02 22:33:52 +0000 @@ -3459,7 +3459,7 @@ ;; Matches context difference listing "\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*" ;; Matches unidiff difference listing - "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@\n" + "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@" ;; Matches reporter.el bug report "^current state:\n==============\n" ;; Matches commonly used "cut" boundaries ------------------------------------------------------------ revno: 99435 committer: Juri Linkov branch nick: trunk timestamp: Wed 2010-02-03 00:28:57 +0200 message: * ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by '(RCS SCCS) with inverted condition. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-02 11:19:36 +0000 +++ lisp/ChangeLog 2010-02-02 22:28:57 +0000 @@ -1,3 +1,8 @@ +2010-02-02 Juri Linkov + + * ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by + '(RCS SCCS) with inverted condition. + 2010-02-02 Michael Albinus * net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH" === modified file 'lisp/ediff-util.el' --- lisp/ediff-util.el 2010-01-13 08:35:10 +0000 +++ lisp/ediff-util.el 2010-02-02 22:28:57 +0000 @@ -1126,8 +1126,8 @@ (defun ediff-file-checked-in-p (file) (and (featurep 'vc-hooks) - ;; CVS files are considered not checked in - (not (memq (vc-backend file) '(nil CVS))) + ;; Only RCS and SCCS files are considered checked in + (memq (vc-backend file) '(RCS SCCS)) (if (fboundp 'vc-state) (and (not (memq (vc-state file) '(edited needs-merge))) ------------------------------------------------------------ revno: 99434 committer: Michael Albinus branch nick: trunk timestamp: Tue 2010-02-02 12:19:36 +0100 message: * net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH" messages. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-01 22:35:04 +0000 +++ lisp/ChangeLog 2010-02-02 11:19:36 +0000 @@ -1,3 +1,8 @@ +2010-02-02 Michael Albinus + + * net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH" + messages. + 2010-02-01 Juri Linkov * arc-mode.el (archive-zip-extract): Use `member-ignore-case' to === modified file 'lisp/net/ange-ftp.el' --- lisp/net/ange-ftp.el 2010-01-28 21:13:01 +0000 +++ lisp/net/ange-ftp.el 2010-02-02 11:19:36 +0000 @@ -720,7 +720,7 @@ "^Connected \\|^$\\|^Remote system\\|^Using\\|^ \\|Password:\\|" "^Data connection \\|" "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|" - "^500 .*AUTH \\(KERBEROS\\|GSSAPI\\)\\|^KERBEROS\\|" + "^500 .*AUTH\\|^KERBEROS\\|" "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd "^534 Kerberos Authentication not enabled\\|" "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT") ------------------------------------------------------------ revno: 99433 committer: Juri Linkov branch nick: trunk timestamp: Tue 2010-02-02 00:35:04 +0200 message: * arc-mode.el (archive-zip-extract): Use `member-ignore-case' to compare with "pkunzip" and "pkzip" instead of only "pkzip". In the `archive-extract-by-stdout' branch use `shell-quote-argument' only when (car archive-zip-extract) is "unzip". (Bug#5475) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-01 18:25:47 +0000 +++ lisp/ChangeLog 2010-02-01 22:35:04 +0000 @@ -1,3 +1,10 @@ +2010-02-01 Juri Linkov + + * arc-mode.el (archive-zip-extract): Use `member-ignore-case' to + compare with "pkunzip" and "pkzip" instead of only "pkzip". + In the `archive-extract-by-stdout' branch use `shell-quote-argument' + only when (car archive-zip-extract) is "unzip". (Bug#5475) + 2010-02-01 Stefan Monnier * doc-view.el (doc-view-new-window-function): Be a bit more defensive. === modified file 'lisp/arc-mode.el' --- lisp/arc-mode.el 2010-01-28 20:06:36 +0000 +++ lisp/arc-mode.el 2010-02-01 22:35:04 +0000 @@ -1782,12 +1782,16 @@ (apply 'vector (nreverse files)))) (defun archive-zip-extract (archive name) - (if (equal (car archive-zip-extract) "pkzip") + (if (member-ignore-case (car archive-zip-extract) '("pkunzip" "pkzip")) (archive-*-extract archive name archive-zip-extract) - ;; unzip expands wildcards in NAME, so we need to quote it. - ;; FIXME: Does pkzip need similar treatment? - (archive-extract-by-stdout archive (shell-quote-argument name) - archive-zip-extract))) + (archive-extract-by-stdout + archive + ;; unzip expands wildcards in NAME, so we need to quote it. + ;; FIXME: Does pkunzip need similar treatment? + (if (equal (car archive-zip-extract) "unzip") + (shell-quote-argument name) + name) + archive-zip-extract))) (defun archive-zip-write-file-member (archive descr) (archive-*-write-file-member