Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103495. ------------------------------------------------------------ revno: 103495 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 23:57:49 -0800 message: Info-gnustep.plist trivia. * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist: Refer to etc/NEXTSTEP rather than emacs-app.sf.net. diff: === modified file 'nextstep/ChangeLog' --- nextstep/ChangeLog 2011-01-25 04:08:28 +0000 +++ nextstep/ChangeLog 2011-03-03 07:57:49 +0000 @@ -1,3 +1,8 @@ +2011-03-03 Glenn Morris + + * GNUstep/Emacs.base/Resources/Info-gnustep.plist: + Refer to etc/NEXTSTEP rather than emacs-app.sf.net. + 2011-01-02 Glenn Morris * Cocoa/Emacs.base/Contents/Info.plist: === modified file 'nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist' --- nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2011-02-16 08:39:19 +0000 +++ nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2011-03-03 07:57:49 +0000 @@ -9,7 +9,7 @@ "Scott Bender (OpenStep)", "Christian Limpach (NeXTStep)", "Carl Edman (NeXTStep)", - "..see http://emacs-app.sf.net/authorship.html" + "..see etc/NEXTSTEP" ); Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; ------------------------------------------------------------ revno: 103494 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 23:52:10 -0800 message: * lisp/vc/vc-rcs.el: Remove some ancient comments. Anyone using rcs < 5.6.2 in 2011 probably has a functioning time machine, so does not need hand-holding. diff: === modified file 'lisp/vc/vc-rcs.el' --- lisp/vc/vc-rcs.el 2011-01-26 08:36:39 +0000 +++ lisp/vc/vc-rcs.el 2011-03-03 07:52:10 +0000 @@ -25,14 +25,10 @@ ;; See vc.el -;; Some features will not work with old RCS versions. Where +;; Some features will not work with ancient RCS versions. Where ;; appropriate, VC finds out which version you have, and allows or -;; disallows those features (stealing locks, for example, works only -;; from 5.6.2 onwards). -;; Even initial checkins will fail if your RCS version is so old that ci -;; doesn't understand -t-; this has been known to happen to people running -;; NExTSTEP 3.0. -;; +;; disallows those features. + ;; You can support the RCS -x option by customizing vc-rcs-master-templates. ;;; Code: @@ -391,7 +387,7 @@ (vc-rcs-set-default-branch file (if (vc-rcs-trunk-p new-version) nil (vc-branch-part new-version))) - ;; If this is an old RCS release, we might have + ;; If this is an old (pre-1992!) RCS release, we might have ;; to remove a remaining lock. (if (not (vc-rcs-release-p "5.6.2")) ;; exit status of 1 is also accepted. ------------------------------------------------------------ revno: 103493 author: Bob Rogers committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 23:33:35 -0800 message: vc-dir fix for bug#7349. * lisp/vc/vc-dir.el (vc-dir-mode-map): Bind vc-dir-find-file to e, like in dired. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-03 07:27:52 +0000 +++ lisp/ChangeLog 2011-03-03 07:33:35 +0000 @@ -1,3 +1,7 @@ +2011-03-03 Bob Rogers + + * vc/vc-dir.el (vc-dir-mode-map): Bind vc-dir-find-file to e. (Bug#7349) + 2011-03-03 Vagn Johansen (tiny change) * vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client === modified file 'lisp/vc/vc-dir.el' --- lisp/vc/vc-dir.el 2011-02-10 19:37:42 +0000 +++ lisp/vc/vc-dir.el 2011-03-03 07:33:35 +0000 @@ -265,6 +265,7 @@ (define-key map [C-up] 'vc-dir-previous-directory) ;; The remainder. (define-key map "f" 'vc-dir-find-file) + (define-key map "e" 'vc-dir-find-file) ; dired-mode compatibility (define-key map "\C-m" 'vc-dir-find-file) (define-key map "o" 'vc-dir-find-file-other-window) (define-key map "\C-c\C-c" 'vc-dir-kill-dir-status-process) ------------------------------------------------------------ revno: 103492 author: Vagn Johansen committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 23:27:52 -0800 message: vc-svn fix for bug#7663 on MS Windows. (tiny change) * lisp/vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client programs output backslashes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-03 07:08:22 +0000 +++ lisp/ChangeLog 2011-03-03 07:27:52 +0000 @@ -1,3 +1,8 @@ +2011-03-03 Vagn Johansen (tiny change) + + * vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client + programs output backslashes. (Bug#7663) + 2011-03-03 Glenn Morris * mail/sendmail.el (mail-mode-map): Remove mail-sent-via. === modified file 'lisp/vc/vc-svn.el' --- lisp/vc/vc-svn.el 2011-02-12 01:12:53 +0000 +++ lisp/vc/vc-svn.el 2011-03-03 07:27:52 +0000 @@ -174,7 +174,9 @@ (while (re-search-forward re nil t) (let ((state (cdr (assq (aref (match-string 1) 0) state-map))) (propstat (cdr (assq (aref (match-string 2) 0) state-map))) - (filename (match-string 4))) + (filename (if (memq system-type '(windows-nt ms-dos)) + (replace-regexp-in-string "\\\\" "/" (match-string 4)) + (match-string 4)))) (and (memq propstat '(conflict edited)) (not (eq state 'conflict)) ; conflict always wins (setq state propstat)) ------------------------------------------------------------ revno: 103491 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 23:19:54 -0800 message: * url.texi (Configuration): Update url-configuration-directory description. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-03-03 07:14:16 +0000 +++ doc/misc/ChangeLog 2011-03-03 07:19:54 +0000 @@ -2,6 +2,7 @@ * url.texi (Dealing with HTTP documents): Remove reference to function url-decode-text-part; never seems to have existed. (Bug#6038) + (Configuration): Update url-configuration-directory description. 2011-03-02 Glenn Morris === modified file 'doc/misc/url.texi' --- doc/misc/url.texi 2011-03-03 07:14:16 +0000 +++ doc/misc/url.texi 2011-03-03 07:19:54 +0000 @@ -116,7 +116,10 @@ @cindex @file{~/.url} @cindex configuration files The directory in which URL configuration files, the cache etc., -reside. Default @file{~/.url}. +reside. The old default was @file{~/.url}, and this directory +is still used if it exists. The new default is a @file{url/} +directory in @code{user-emacs-directory}, which is normally +@file{~/.emacs.d}. @end defvar @node Parsed URLs ------------------------------------------------------------ revno: 103490 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 23:14:16 -0800 message: url.texi doc fix for bug#6038. * doc/misc/url.texi (Dealing with HTTP documents): Remove reference to function url-decode-text-part; never seems to have existed in any version. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-03-02 07:59:02 +0000 +++ doc/misc/ChangeLog 2011-03-03 07:14:16 +0000 @@ -1,3 +1,8 @@ +2011-03-03 Glenn Morris + + * url.texi (Dealing with HTTP documents): Remove reference to + function url-decode-text-part; never seems to have existed. (Bug#6038) + 2011-03-02 Glenn Morris * dired-x.texi (Multiple Dired Directories): Remove mentions === modified file 'doc/misc/url.texi' --- doc/misc/url.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/url.texi 2011-03-03 07:14:16 +0000 @@ -383,20 +383,7 @@ HTTP URLs are retrieved into a buffer containing the HTTP headers followed by the body. Since the headers are quasi-MIME, they may be processed using the MIME library. @xref{Top,, Emacs MIME, -emacs-mime, The Emacs MIME Manual}. The URL package provides a -function to do this in general: - -@defun url-decode-text-part handle &optional coding -This function decodes charset-encoded text in the current buffer. In -Emacs, the buffer is expected to be unibyte initially and is set to -multibyte after decoding. -HANDLE is the MIME handle of the original part. CODING is an explicit -coding to use, overriding what the MIME headers specify. -The coding system used for the decoding is returned. - -Note that this function doesn't deal with @samp{http-equiv} charset -specifications in HTML @samp{} elements. -@end defun +emacs-mime, The Emacs MIME Manual}. @node file/ftp @section file and ftp ------------------------------------------------------------ revno: 103489 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 23:08:22 -0800 message: sendmail.el fix for bug#1776. * lisp/mail/sendmail.el (mail-mode-map): Remove mail-sent-via. (mail-mode): Remove mail-sent-via from the doc. (mail-sent-via): Make it obsolete. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-03 06:39:11 +0000 +++ lisp/ChangeLog 2011-03-03 07:08:22 +0000 @@ -1,5 +1,9 @@ 2011-03-03 Glenn Morris + * mail/sendmail.el (mail-mode-map): Remove mail-sent-via. + (mail-mode): Remove mail-sent-via from the doc. + (mail-sent-via): Make it obsolete. (Bug#1776) + * progmodes/grep.el (grep-highlight-matches): Doc fix. (grep-process-setup): No highlighting without font-lock. (Bug#8084) === modified file 'lisp/mail/sendmail.el' --- lisp/mail/sendmail.el 2011-01-25 04:08:28 +0000 +++ lisp/mail/sendmail.el 2011-03-03 07:08:22 +0000 @@ -309,7 +309,6 @@ (define-key map [remap split-line] 'mail-split-line) (define-key map "\C-c\C-q" 'mail-fill-yanked-message) (define-key map "\C-c\C-w" 'mail-signature) - (define-key map "\C-c\C-v" 'mail-sent-via) (define-key map "\C-c\C-c" 'mail-send-and-exit) (define-key map "\C-c\C-s" 'mail-send) (define-key map "\C-c\C-i" 'mail-attach-file) @@ -349,9 +348,6 @@ (define-key map [menu-bar headers expand-aliases] '("Expand Aliases" . expand-mail-aliases)) - (define-key map [menu-bar headers sent-via] - '("Sent-Via" . mail-sent-via)) - (define-key map [menu-bar headers mail-reply-to] '("Mail-Reply-To" . mail-mail-reply-to)) @@ -665,7 +661,6 @@ \\[mail-signature] mail-signature (insert `mail-signature-file' file). \\[mail-yank-original] mail-yank-original (insert current message, in Rmail). \\[mail-fill-yanked-message] mail-fill-yanked-message (fill what was yanked). -\\[mail-sent-via] mail-sent-via (add a sent-via field for each To or CC). Turning on Mail mode runs the normal hooks `text-mode-hook' and `mail-mode-hook' (in that order)." (make-local-variable 'mail-reply-action) @@ -1346,6 +1341,9 @@ (point))))) ;; Insert a copy, with altered header field name. (insert-before-markers "Sent-via:" to-line)))))) + +(make-obsolete 'mail-sent-via "nobody can remember what it is for." "24.1") + (defun mail-to () "Move point to end of To field, creating it if necessary." ------------------------------------------------------------ revno: 103488 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 23:03:36 -0800 message: Fix typo in previous NEWS change. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-03-03 07:01:32 +0000 +++ etc/NEWS 2011-03-03 07:03:36 +0000 @@ -67,11 +67,11 @@ ** emacsclient changes -+++ *** New emacsclient argument --parent-id ID can be used to open a client frame in parent X window ID, via XEmbed. This works like the --parent-id argument to Emacs. ++++ *** New emacsclient argument -q/--quiet suppresses some status messages. *** If emacsclient shuts down as a result of Emacs signalling an ------------------------------------------------------------ revno: 103487 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 23:01:32 -0800 message: * etc/NEWS: Mention emacsclient -q. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-03-01 03:38:41 +0000 +++ etc/NEWS 2011-03-03 07:01:32 +0000 @@ -67,10 +67,13 @@ ** emacsclient changes ++++ *** New emacsclient argument --parent-id ID can be used to open a client frame in parent X window ID, via XEmbed. This works like the --parent-id argument to Emacs. +*** New emacsclient argument -q/--quiet suppresses some status messages. + *** If emacsclient shuts down as a result of Emacs signalling an error, its exit status is 1. ------------------------------------------------------------ revno: 103486 author: Drake Wilson committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 23:00:23 -0800 message: Add --quiet option for emacsclient (bug#663) (tiny change) * lib-src/emacsclient.c (longopts): Add quiet. (decode_options): Handle q/quiet. (print_help_and_exit): Add q/quiet. (main): Suppress some messages if quiet option is used. * doc/emacs/misc.texi (emacsclient Options): Add q/quiet. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-03-02 08:53:23 +0000 +++ doc/emacs/ChangeLog 2011-03-03 07:00:23 +0000 @@ -1,3 +1,7 @@ +2011-03-03 Drake Wilson (tiny change) + + * misc.texi (emacsclient Options): Add q/quiet. + 2011-03-02 Glenn Morris * mule.texi (Communication Coding) : === modified file 'doc/emacs/misc.texi' --- doc/emacs/misc.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/misc.texi 2011-03-03 07:00:23 +0000 @@ -1672,6 +1672,11 @@ edit the server buffers within Emacs, and they are @emph{not} killed when you type @kbd{C-x #} in them. +@item -q +@itemx --quiet +Do not let @command{emacsclient} display messages about waiting for +Emacs or connecting to remote server sockets. + @item -s @var{server-name} @itemx --socket-name=@var{server-name} Connect to the Emacs server named @var{server-name}. The server name === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-02-26 08:36:56 +0000 +++ lib-src/ChangeLog 2011-03-03 07:00:23 +0000 @@ -1,3 +1,10 @@ +2011-03-03 Drake Wilson (tiny change) + + * emacsclient.c (longopts): Add quiet. + (decode_options): Handle q/quiet. + (print_help_and_exit): Add q/quiet. + (main): Suppress some messages if quiet option is used. + 2011-02-26 Eli Zaretskii * Makefile.in (fakemail${EXEEXT}): Depend on lib/ignore-value.h. === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2011-02-26 07:44:38 +0000 +++ lib-src/emacsclient.c 2011-03-03 07:00:23 +0000 @@ -129,6 +129,9 @@ /* Nonzero means don't wait for a response from Emacs. --no-wait. */ int nowait = 0; +/* Nonzero means don't print messages for successful operations. --quiet. */ +int quiet = 0; + /* Nonzero means args are expressions to be evaluated. --eval. */ int eval = 0; @@ -164,6 +167,7 @@ struct option longopts[] = { { "no-wait", no_argument, NULL, 'n' }, + { "quiet", no_argument, NULL, 'q' }, { "eval", no_argument, NULL, 'e' }, { "help", no_argument, NULL, 'H' }, { "version", no_argument, NULL, 'V' }, @@ -523,9 +527,9 @@ { int opt = getopt_long_only (argc, argv, #ifndef NO_SOCKETS_IN_FILE_SYSTEM - "VHnea:s:f:d:tc", + "VHneqa:s:f:d:tc", #else - "VHnea:f:d:tc", + "VHneqa:f:d:tc", #endif longopts, 0); @@ -569,6 +573,10 @@ eval = 1; break; + case 'q': + quiet = 1; + break; + case 'V': message (FALSE, "emacsclient %s\n", VERSION); exit (EXIT_SUCCESS); @@ -660,6 +668,7 @@ use the current Emacs frame\n\ -e, --eval Evaluate the FILE arguments as ELisp expressions\n\ -n, --no-wait Don't wait for the server to return\n\ +-q, --quiet Don't display messages on success\n\ -d DISPLAY, --display=DISPLAY\n\ Visit the file in the given display\n\ --parent-id=ID Open in parent window ID, via XEmbed\n" @@ -986,7 +995,7 @@ if (! get_server_config (&server, auth_string)) return INVALID_SOCKET; - if (server.sin_addr.s_addr != inet_addr ("127.0.0.1")) + if (server.sin_addr.s_addr != inet_addr ("127.0.0.1") && !quiet) message (FALSE, "%s: connected to remote socket at %s\n", progname, inet_ntoa (server.sin_addr)); @@ -1712,7 +1721,7 @@ send_to_emacs (emacs_socket, "\n"); /* Wait for an answer. */ - if (!eval && !tty && !nowait) + if (!eval && !tty && !nowait && !quiet) { printf ("Waiting for Emacs..."); needlf = 2; ------------------------------------------------------------ revno: 103485 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 22:39:11 -0800 message: grep.el fix for bug#8084. * lisp/progmodes/grep.el (grep-highlight-matches): Doc fix. (grep-process-setup): No highlighting without font-lock. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-03 06:25:21 +0000 +++ lisp/ChangeLog 2011-03-03 06:39:11 +0000 @@ -1,5 +1,8 @@ 2011-03-03 Glenn Morris + * progmodes/grep.el (grep-highlight-matches): Doc fix. + (grep-process-setup): No highlighting without font-lock. (Bug#8084) + * vc/vc-bzr.el (vc-bzr-state-heuristic): Handle dirstate entries with no parents. (Bug#8025) === modified file 'lisp/progmodes/grep.el' --- lisp/progmodes/grep.el 2011-02-10 19:13:31 +0000 +++ lisp/progmodes/grep.el 2011-03-03 06:39:11 +0000 @@ -72,7 +72,9 @@ Some grep programs are able to surround matches with special markers in grep output. Such markers can be used to highlight -matches in grep mode. +matches in grep mode. This requires `font-lock-mode' to be active +in grep buffers, so if you have globally disabled font-lock-mode, +you will not get highlighting. This option sets the environment variable GREP_COLORS to specify markers for highlighting and GREP_OPTIONS to add the --color @@ -462,6 +464,8 @@ (when (eq grep-highlight-matches 'auto-detect) (grep-compute-defaults)) (unless (or (eq grep-highlight-matches 'auto-detect) + ;; Uses font-lock to parse color escapes. (Bug#8084) + (null font-lock-mode) (null grep-highlight-matches)) ;; `setenv' modifies `process-environment' let-bound in `compilation-start' ;; Any TERM except "dumb" allows GNU grep to use `--color=auto' ------------------------------------------------------------ revno: 103484 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 22:25:21 -0800 message: vc-bzr fix for bug#8025. * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): Handle dirstate entries with no parents. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-02 08:31:47 +0000 +++ lisp/ChangeLog 2011-03-03 06:25:21 +0000 @@ -1,3 +1,8 @@ +2011-03-03 Glenn Morris + + * vc/vc-bzr.el (vc-bzr-state-heuristic): Handle dirstate entries + with no parents. (Bug#8025) + 2011-03-02 Glenn Morris * man.el (Man-support-local-filenames): Also handle Red Hat's man. === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2011-02-19 21:23:51 +0000 +++ lisp/vc/vc-bzr.el 2011-03-03 06:25:21 +0000 @@ -182,10 +182,19 @@ ;; format 3' in the first line. ;; If the `checkout/dirstate' file cannot be parsed, fall back to ;; running `vc-bzr-state'." + ;; + ;; The format of the dirstate file is explained in bzrlib/dirstate.py + ;; in the bzr distribution. Basically: + ;; header-line giving the version of the file format in use. + ;; a few lines of stuff + ;; entries, one per line, with null-separated fields. Each line: + ;; entry_key = dirname (may be empty), basename, file-id + ;; current = common ( = kind, fingerprint, size, executable ) + ;; + working ( = packed_stat ) + ;; parent = common ( as above ) + history ( = rev_id ) + ;; kinds = (r)elocated, (a)bsent, (d)irectory, (f)ile, (l)ink (lexical-let ((root (vc-bzr-root file))) (when root ; Short cut. - ;; This looks at internal files. May break if they change - ;; their format. (lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate root))) (condition-case nil (with-temp-buffer @@ -210,13 +219,14 @@ ;; was executable the last time bzr checked? "[^\0]*\0" "[^\0]*\0" ;? - "\\([^\0]*\\)\0" ;"a/f/d" a=added? + ;; Parent information. Absent in a new repo. + "\\(?:\\([^\0]*\\)\0" ;"a/f/d" a=added? "\\([^\0]*\\)\0" ;sha1 again? "\\([^\0]*\\)\0" ;size again? ;; y/n. Whether or not the repo thinks ;; the file should be executable? "\\([^\0]*\\)\0" - "[^\0]*\0" ;last revid? + "[^\0]*\0\\)?" ;last revid? ;; There are more fields when merges are pending. ) nil t) @@ -226,7 +236,10 @@ ;; conflict markers). (cond ((eq (char-after (match-beginning 1)) ?a) 'removed) - ((eq (char-after (match-beginning 4)) ?a) 'added) + ;; If there is no parent, this must be a new repo. + ;; If file is in dirstate, can only be added (b#8025). + ((or (not (match-beginning 4)) + (eq (char-after (match-beginning 4)) ?a)) 'added) ((or (and (eq (string-to-number (match-string 3)) (nth 7 (file-attributes file))) (equal (match-string 5) ------------------------------------------------------------ revno: 103483 committer: Ken Brown branch nick: trunk timestamp: Wed 2011-03-02 16:30:51 -0500 message: * sheap.c (STATIC_HEAP_SIZE): Increase to 13MB. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-02 05:25:09 +0000 +++ src/ChangeLog 2011-03-02 21:30:51 +0000 @@ -1,3 +1,7 @@ +2011-03-02 kbrown + + * sheap.c (STATIC_HEAP_SIZE): Increase to 13MB. + 2011-03-02 Paul Eggert Work around some portability problems with symlinks. === modified file 'src/sheap.c' --- src/sheap.c 2011-01-25 04:08:28 +0000 +++ src/sheap.c 2011-03-02 21:30:51 +0000 @@ -25,7 +25,7 @@ #include -#define STATIC_HEAP_SIZE (12 * 1024 * 1024) +#define STATIC_HEAP_SIZE (13 * 1024 * 1024) int debug_sheap = 0; ------------------------------------------------------------ revno: 103482 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 09:19:01 -0800 message: Comment fix. diff: === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-03-02 17:12:43 +0000 +++ lisp/dired-x.el 2011-03-02 17:19:01 +0000 @@ -956,7 +956,6 @@ ;; FIXME "man ./" does not work with dired-do-shell-command, ;; because there seems to be no way for us to modify the filename, ;; only the command. Hmph. `dired-man' works though. - ;; `dired-man' does (list "\\.\\(?:[0-9]\\|man\\)\\'" '(let ((loc (Man-support-local-filenames))) (cond ((eq loc 'man-db) "man -l") ((eq loc 'man) "man ./") ------------------------------------------------------------ revno: 103481 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 09:12:43 -0800 message: Fix previous dired-x.el change. diff: === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-03-02 08:31:47 +0000 +++ lisp/dired-x.el 2011-03-02 17:12:43 +0000 @@ -735,9 +735,9 @@ ((eq major-mode 'dired-mode) (dired-get-filename t t)))) current-prefix-arg shell-command-default-error-buffer)) - (let ((default-directory (if (eq major-mode 'dired-mode) - (dired-current-directory) - default-directory))) + (let ((default-directory (or (and (eq major-mode 'dired-mode) + (dired-current-directory)) + default-directory))) (shell-command command output-buffer error-buffer))) ------------------------------------------------------------ revno: 103480 author: Julien Danjou committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-03-02 12:34:12 +0000 message: gnus-art.el (gnus-with-article-buffer): Fix buffer live check. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-03-01 14:32:24 +0000 +++ lisp/gnus/ChangeLog 2011-03-02 12:34:12 +0000 @@ -1,3 +1,7 @@ +2011-03-02 Julien Danjou + + * gnus-art.el (gnus-with-article-buffer): Fix buffer live check. + 2011-03-01 Julien Danjou * gnus-art.el (list-identifier): Add list-identifier as a parameter === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-03-01 14:32:24 +0000 +++ lisp/gnus/gnus-art.el 2011-03-02 12:34:12 +0000 @@ -1743,7 +1743,7 @@ (put 'gnus-with-article-headers 'edebug-form-spec '(body)) (defmacro gnus-with-article-buffer (&rest forms) - `(when (buffer-live-p gnus-article-buffer) + `(when (buffer-live-p (get-buffer gnus-article-buffer)) (with-current-buffer gnus-article-buffer (let ((inhibit-read-only t)) ,@forms)))) ------------------------------------------------------------ revno: 103479 committer: Andreas Schwab branch nick: emacs timestamp: Wed 2011-03-02 11:42:47 +0100 message: Update autoloads diff: === modified file 'lisp/dired.el' --- lisp/dired.el 2011-03-01 03:25:24 +0000 +++ lisp/dired.el 2011-03-02 10:42:47 +0000 @@ -4082,8 +4082,8 @@ ;;;*** -;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el" -;;;;;; "3b8851132739ab3f9054bf639873c53e") +;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump) +;;;;;; "dired-x" "dired-x.el" "addd55345656d18cfd5251790a655e2c") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ @@ -4098,6 +4098,11 @@ \(fn &optional OTHER-WINDOW FILE-NAME)" t nil) +(autoload 'dired-jump-other-window "dired-x" "\ +Like \\[dired-jump] (`dired-jump') but in other window. + +\(fn &optional FILE-NAME)" t nil) + (autoload 'dired-do-relsymlink "dired-x" "\ Relative symlink all marked (or next ARG) files into a directory. Otherwise make a relative symbolic link to the current file. ------------------------------------------------------------ revno: 103478 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 00:53:23 -0800 message: Doc fix for bug#8148. * doc/emacs/mule.texi (Communication Coding) : Remove duplicate (essentially) paragraph. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-03-01 04:14:00 +0000 +++ doc/emacs/ChangeLog 2011-03-02 08:53:23 +0000 @@ -1,3 +1,8 @@ +2011-03-02 Glenn Morris + + * mule.texi (Communication Coding) : + Remove duplicate (essentially) paragraph. (Bug#8148) + 2011-03-01 Christoph Scholtes * maintaining.texi (Format of ChangeLog): Add reference to === modified file 'doc/emacs/mule.texi' --- doc/emacs/mule.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/mule.texi 2011-03-02 08:53:23 +0000 @@ -1153,15 +1153,6 @@ specified above, whose value is nonempty is the one that determines the text representation.) -@vindex x-select-request-type - The variable @code{x-select-request-type} specifies a selection data -type of selection to request from the X server. The default value is -@code{nil}, which means Emacs tries @code{COMPOUND_TEXT} and -@code{UTF8_STRING}, and uses whichever result seems more appropriate. -You can explicitly specify the data type by setting the variable to -one of the symbols @code{COMPOUND_TEXT}, @code{UTF8_STRING}, -@code{STRING} and @code{TEXT}. - @node File Name Coding @section Coding Systems for File Names ------------------------------------------------------------ revno: 103477 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 00:31:47 -0800 message: Add some dired-x support for local filenames with Red Hat's man. * lisp/man.el (Man-support-local-filenames): Also handle Red Hat's man. * lisp/dired-x.el (Man-support-local-filenames): Autoload it. (dired-guess-shell-alist-default): Also handle Red Hat's man. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-02 07:59:02 +0000 +++ lisp/ChangeLog 2011-03-02 08:31:47 +0000 @@ -1,5 +1,9 @@ 2011-03-02 Glenn Morris + * man.el (Man-support-local-filenames): Also handle Red Hat's man. + * dired-x.el (Man-support-local-filenames): Autoload it. + (dired-guess-shell-alist-default): Also handle Red Hat's man. + * dired-x.el (dired-default-directory-alist, dired-default-directory): Mark as obsolete. (dired-smart-shell-command): Just call dired-current-directory. === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-03-02 07:59:02 +0000 +++ lisp/dired-x.el 2011-03-02 08:31:47 +0000 @@ -860,7 +860,7 @@ ;; NOTE: Use `gunzip -c' instead of `zcat' on `.gz' files. Some do not ;; install GNU zip's version of zcat. -(declare-function Man-support-local-filenames "man" ()) +(autoload 'Man-support-local-filenames "man") (defvar dired-guess-shell-alist-default (list @@ -953,20 +953,28 @@ " " dired-guess-shell-znew-switches)) ;; The following four extensions are useful with dired-man ("N" key) - (list "\\.\\(?:[0-9]\\|man\\)\\'" '(progn (require 'man) - (if (Man-support-local-filenames) - "man -l" - "cat * | tbl | nroff -man -h"))) - (list "\\.\\(?:[0-9]\\|man\\)\\.g?z\\'" '(progn (require 'man) - (if (Man-support-local-filenames) - "man -l" - "gunzip -qc * | tbl | nroff -man -h")) + ;; FIXME "man ./" does not work with dired-do-shell-command, + ;; because there seems to be no way for us to modify the filename, + ;; only the command. Hmph. `dired-man' works though. + ;; `dired-man' does + (list "\\.\\(?:[0-9]\\|man\\)\\'" '(let ((loc (Man-support-local-filenames))) + (cond ((eq loc 'man-db) "man -l") + ((eq loc 'man) "man ./") + (t + "cat * | tbl | nroff -man -h")))) + (list "\\.\\(?:[0-9]\\|man\\)\\.g?z\\'" + '(let ((loc (Man-support-local-filenames))) + (cond ((eq loc 'man-db) + "man -l") + ((eq loc 'man) + "man ./") + (t "gunzip -qc * | tbl | nroff -man -h"))) ;; Optional decompression. '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q"))) - (list "\\.[0-9]\\.Z\\'" '(progn (require 'man) - (if (Man-support-local-filenames) - "man -l" - "zcat * | tbl | nroff -man -h")) + (list "\\.[0-9]\\.Z\\'" '(let ((loc (Man-support-local-filenames))) + (cond ((eq loc 'man-db) "man -l") + ((eq loc 'man) "man ./") + (t "zcat * | tbl | nroff -man -h"))) ;; Optional conversion to gzip format. '(concat "znew" (if dired-guess-shell-gzip-quiet " -q") " " dired-guess-shell-znew-switches)) === modified file 'lisp/man.el' --- lisp/man.el 2011-01-26 08:36:39 +0000 +++ lisp/man.el 2011-03-02 08:31:47 +0000 @@ -623,36 +623,32 @@ (concat Man-specified-section-option section " " name)))) (defun Man-support-local-filenames () - "Check the availability of `-l' option of the man command. -This option allows `man' to interpret command line arguments -as local filenames. -Return the value of the variable `Man-support-local-filenames' -if it was set to nil or t before the call of this function. -If t, the man command supports `-l' option. If nil, it doesn't. -Otherwise, if the value of `Man-support-local-filenames' -is neither t nor nil, then determine a new value, set it -to the variable `Man-support-local-filenames' and return -a new value." - (if (or (not Man-support-local-filenames) - (eq Man-support-local-filenames t)) - Man-support-local-filenames - (setq Man-support-local-filenames - (with-temp-buffer - (and (equal (condition-case nil - (let ((default-directory - ;; Assure that `default-directory' exists - ;; and is readable. - (if (and (file-directory-p default-directory) - (file-readable-p default-directory)) - default-directory - (expand-file-name "~/")))) - (call-process manual-program nil t nil "--help")) - (error nil)) - 0) - (progn - (goto-char (point-min)) - (search-forward "--local-file" nil t)) - t))))) + "Return non-nil if the man command supports local filenames. +Different man programs support this feature in different ways. +The default Debian man program (\"man-db\") has a `--local-file' +\(or `-l') option for this purpose. The default Red Hat man +program has no such option, but interprets any name containing +a \"/\" as a local filename. The function returns either `man-db' +`man', or nil." + (if (eq Man-support-local-filenames 'auto-detect) + (setq Man-support-local-filenames + (with-temp-buffer + (let ((default-directory + ;; Ensure that `default-directory' exists and is readable. + (if (and (file-directory-p default-directory) + (file-readable-p default-directory)) + default-directory + (expand-file-name "~/")))) + (ignore-errors + (call-process manual-program nil t nil "--help"))) + (cond ((search-backward "--local-file" nil 'move) + 'man-db) + ;; This feature seems to be present in at least ver 1.4f, + ;; which is about 20 years old. + ;; I don't know if this version has an official name? + ((looking-at "^man, versione? [1-9]") + 'man)))) + Man-support-local-filenames)) ;; ====================================================================== ------------------------------------------------------------ revno: 103476 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-03-01 23:59:02 -0800 message: Make dired-default-directory obsolete. As far as I can tell, it was never used outside of dired-smart-shell-command. It doesn't seem worth keeping around as a separate function. * lisp/dired-x.el (dired-default-directory-alist, dired-default-directory): Mark as obsolete. (dired-smart-shell-command): Just call dired-current-directory. * doc/misc/dired-x.texi (Multiple Dired Directories): Remove mentions of dired-default-directory-alist and dired-default-directory. Move dired-smart-shell-command here... (Miscellaneous Commands): ... from here. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-03-02 06:07:30 +0000 +++ doc/misc/ChangeLog 2011-03-02 07:59:02 +0000 @@ -1,3 +1,10 @@ +2011-03-02 Glenn Morris + + * dired-x.texi (Multiple Dired Directories): Remove mentions + of dired-default-directory-alist and dired-default-directory. + Move dired-smart-shell-command here... + (Miscellaneous Commands): ... from here. + 2011-03-02 Paul Eggert * texinfo.tex: Update to version 2011-02-24.09. === modified file 'doc/misc/dired-x.texi' --- doc/misc/dired-x.texi 2011-03-02 04:13:57 +0000 +++ doc/misc/dired-x.texi 2011-03-02 07:59:02 +0000 @@ -867,24 +867,12 @@ directory instead of @code{default-directory}, e.g., @code{find-file} and @code{compile}. -A general mechanism is provided for special handling of the working -directory in special major modes: - -@table @code -@item dired-default-directory-alist -@vindex dired-default-directory-alist -Default: @code{((dired-mode . (dired-current-directory)))} - -Alist of major modes and their notion of @code{default-directory}, as a -Lisp expression to evaluate. A resulting value of @code{nil} is ignored -in favor of @code{default-directory}. - -@item dired-default-directory -@findex dired-default-directory -Use this function like you would use the variable -@code{default-directory}, except that @code{dired-default-directory} -also consults the variable @code{dired-default-directory-alist}. -@end table +@findex dired-smart-shell-command +@findex shell-command +@kindex M-! +The command @code{dired-smart-shell-command}, bound to @kbd{M-!} in +Dired buffers, is like @code{shell-command}, but it runs with +@code{default-directory} bound to the current Dired directory. @node Find File At Point, Miscellaneous Commands, Multiple Dired Directories, Top @section Find File At Point @@ -993,12 +981,6 @@ @end table @table @code -@item dired-smart-shell-command -@findex dired-smart-shell-command -@findex shell-command -@kindex M-! -Like function @code{shell-command}, but in the current Dired directory. -Bound to @kbd{M-!} in Dired buffers. @item dired-jump @findex dired-jump === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-02 07:44:33 +0000 +++ lisp/ChangeLog 2011-03-02 07:59:02 +0000 @@ -1,5 +1,9 @@ 2011-03-02 Glenn Morris + * dired-x.el (dired-default-directory-alist, dired-default-directory): + Mark as obsolete. + (dired-smart-shell-command): Just call dired-current-directory. + * dired-x.el (dired-jump-other-window): Add autoload. (dired-default-directory-alist, dired-default-directory): Doc fixes. (dired-default-directory-alist): Mark as risky. === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-03-02 07:44:33 +0000 +++ lisp/dired-x.el 2011-03-02 07:59:02 +0000 @@ -710,6 +710,8 @@ determine a default directory.") (put 'dired-default-directory-alist 'risky-local-variable t) ; gets eval'd +(make-obsolete-variable 'dired-default-directory-alist + "this feature is due to be removed." "24.1") (defun dired-default-directory () "Return the `dired-default-directory-alist' entry for the current major-mode. @@ -717,6 +719,12 @@ (or (eval (cdr (assq major-mode dired-default-directory-alist))) default-directory)) +;; It looks like this was intended to be something of a "general" feature, +;; but it only ever seems to have been used in dired-smart-shell-command, +;; and does not seem worth keeping around (?). +(make-obsolete 'dired-default-directory + "this feature is due to be removed." "24.1") + (defun dired-smart-shell-command (command &optional output-buffer error-buffer) "Like function `shell-command', but in the current Virtual Dired directory." (interactive @@ -727,7 +735,9 @@ ((eq major-mode 'dired-mode) (dired-get-filename t t)))) current-prefix-arg shell-command-default-error-buffer)) - (let ((default-directory (dired-default-directory))) + (let ((default-directory (if (eq major-mode 'dired-mode) + (dired-current-directory) + default-directory))) (shell-command command output-buffer error-buffer)))