Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103359. ------------------------------------------------------------ revno: 103359 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2011-02-20 04:08:04 +0000 message: nnimap.el (nnimap-wait-for-response): Ensure that we get the entire line we're waiting for. gnus-art.el (gnus-article-next-page-1): Because customized mode-line face with line-width greater than zero will cause RET in gnus summary buffer to scroll down article page-wise because auto vscroll happens, it should be temporalily disabled when doing a scroll-up. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-02-19 19:40:59 +0000 +++ lisp/gnus/ChangeLog 2011-02-20 04:08:04 +0000 @@ -7,6 +7,18 @@ * nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update, in case it's not yet loaded. +2011-02-20 Lars Ingebrigtsen + + * nnimap.el (nnimap-wait-for-response): Ensure that we get the entire + line we're waiting for. + +2011-02-19 Darren Hoo (tiny change) + + * gnus-art.el (gnus-article-next-page-1): Because customized mode-line + face with line-width greater than zero will cause RET in gnus summary + buffer to scroll down article page-wise because auto vscroll happens, + it should be temporalily disabled when doing a scroll-up. + 2011-02-19 Lars Ingebrigtsen * nnimap.el (nnimap-parse-copied-articles): Allow for " OK" === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-02-19 09:45:07 +0000 +++ lisp/gnus/gnus-art.el 2011-02-20 04:08:04 +0000 @@ -6322,7 +6322,8 @@ (defun gnus-article-next-page-1 (lines) (condition-case () - (let ((scroll-in-place nil)) + (let ((scroll-in-place nil) + (auto-window-vscroll nil)) (scroll-up lines)) (end-of-buffer ;; Long lines may cause an end-of-buffer error. === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-02-19 09:45:07 +0000 +++ lisp/gnus/nnimap.el 2011-02-20 04:08:04 +0000 @@ -1641,7 +1641,7 @@ (progn (forward-line -1) (looking-at "\\*")))) - (not (looking-at (format "%d " sequence))))) + (not (looking-at (format "%d .*\n" sequence))))) (when messagep (nnheader-message 7 "nnimap read %dk" (/ (buffer-size) 1000))) (nnheader-accept-process-output process) ------------------------------------------------------------ revno: 103358 committer: Glenn Morris branch nick: trunk timestamp: Sat 2011-02-19 16:16:54 -0800 message: edmacro.el trivia. * lisp/edmacro.el: Remove old header comment. (edmacro-eight-bits): Make it a defcustom. Don't autoload it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-20 00:09:28 +0000 +++ lisp/ChangeLog 2011-02-20 00:16:54 +0000 @@ -1,5 +1,8 @@ 2011-02-20 Glenn Morris + * edmacro.el (edmacro-eight-bits): Make it a defcustom. + Don't autoload it. + * autorevert.el (auto-revert-mode, auto-revert-tail-mode) (global-auto-revert-ignore-buffer): Remove leading "*" from docs. === modified file 'lisp/edmacro.el' --- lisp/edmacro.el 2011-01-25 04:08:28 +0000 +++ lisp/edmacro.el 2011-02-20 00:16:54 +0000 @@ -61,11 +61,6 @@ ;; With a prefix argument, `edit-kbd-macro' will format the ;; macro in a more concise way that omits the comments. -;; This package requires GNU Emacs 19 or later, and daveg's CL -;; package 2.02 or later. (CL 2.02 comes standard starting with -;; Emacs 19.18.) This package does not work with Emacs 18 or -;; Lucid Emacs. - ;;; Code: (eval-when-compile @@ -75,10 +70,11 @@ ;;; The user-level commands for editing macros. -;;;###autoload -(defvar edmacro-eight-bits nil - "*Non-nil if `edit-kbd-macro' should leave 8-bit characters intact. -Default nil means to write characters above \\177 in octal notation.") +(defcustom edmacro-eight-bits nil + "Non-nil if `edit-kbd-macro' should leave 8-bit characters intact. +Default nil means to write characters above \\177 in octal notation." + :type 'boolean + :group 'kmacro) (defvar edmacro-mode-map (let ((map (make-sparse-keymap))) ------------------------------------------------------------ revno: 103357 committer: Glenn Morris branch nick: trunk timestamp: Sat 2011-02-19 16:09:28 -0800 message: autorevert.el trivia. * lisp/autorevert.el (auto-revert-mode, auto-revert-tail-mode) (global-auto-revert-ignore-buffer): Remove leading "*" from docs. It makes zero sense to use it with these variables. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-19 22:20:35 +0000 +++ lisp/ChangeLog 2011-02-20 00:09:28 +0000 @@ -1,3 +1,8 @@ +2011-02-20 Glenn Morris + + * autorevert.el (auto-revert-mode, auto-revert-tail-mode) + (global-auto-revert-ignore-buffer): Remove leading "*" from docs. + 2011-02-19 Dmitry Bolshakov Dima Kogan (tiny change) === modified file 'lisp/autorevert.el' --- lisp/autorevert.el 2011-01-25 04:08:28 +0000 +++ lisp/autorevert.el 2011-02-20 00:09:28 +0000 @@ -116,12 +116,12 @@ ;;; What's this?: ;; Autoload for the benefit of `make-mode-line-mouse-sensitive'. ;;; What's this?: ;;;###autoload (defvar auto-revert-mode nil - "*Non-nil when Auto-Revert Mode is active. + "Non-nil when Auto-Revert Mode is active. Never set this variable directly, use the command `auto-revert-mode' instead.") (put 'auto-revert-mode 'permanent-local t) (defvar auto-revert-tail-mode nil - "*Non-nil when Auto-Revert Tail Mode is active. + "Non-nil when Auto-Revert Tail Mode is active. Never set this variable directly, use the command `auto-revert-tail-mode' instead.") (put 'auto-revert-tail-mode 'permanent-local t) @@ -254,8 +254,7 @@ :version "22.1") (defvar global-auto-revert-ignore-buffer nil - "*When non-nil, Global Auto-Revert Mode will not revert this buffer. - + "When non-nil, Global Auto-Revert Mode will not revert this buffer. This variable becomes buffer local when set in any fashion.") (make-variable-buffer-local 'global-auto-revert-ignore-buffer) ------------------------------------------------------------ revno: 103356 author: Dmitry Bolshakov committer: Chong Yidong branch nick: trunk timestamp: Sat 2011-02-19 17:20:35 -0500 message: Prevent hideshow from parsing braces inside comments (Bug#8036). * progmodes/hideshow.el (hs-find-block-beginning) (hs-hide-level-recursive): Ignore comments when parsing braces. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-19 21:23:51 +0000 +++ lisp/ChangeLog 2011-02-19 22:20:35 +0000 @@ -1,3 +1,15 @@ +2011-02-19 Dmitry Bolshakov + Dima Kogan (tiny change) + + * progmodes/hideshow.el (hs-find-block-beginning) + (hs-hide-level-recursive): Ignore comments when parsing braces + (Bug#8036). + +2011-02-19 Chong Yidong + + * vc/vc-bzr.el (vc-bzr-bound-branch-p): New function. + (vc-bzr-pull): Use it. + 2011-02-19 Chong Yidong * vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted. === modified file 'lisp/progmodes/hideshow.el' --- lisp/progmodes/hideshow.el 2011-01-25 04:08:28 +0000 +++ lisp/progmodes/hideshow.el 2011-02-19 22:20:35 +0000 @@ -689,6 +689,8 @@ (point) ;; look backward for the start of a block that contains the cursor (while (and (re-search-backward hs-block-start-regexp nil t) + (save-match-data + (not (nth 4 (syntax-ppss)))) ; not inside comments (not (setq done (< here (save-excursion (hs-forward-sexp (match-data t) 1) @@ -711,10 +713,12 @@ (forward-comment (buffer-size)) (and (< (point) maxp) (re-search-forward hs-block-start-regexp maxp t))) - (if (> arg 1) - (hs-hide-level-recursive (1- arg) minp maxp) - (goto-char (match-beginning hs-block-start-mdata-select)) - (hs-hide-block-at-point t))) + (when (save-match-data + (not (nth 4 (syntax-ppss)))) ; not inside comments + (if (> arg 1) + (hs-hide-level-recursive (1- arg) minp maxp) + (goto-char (match-beginning hs-block-start-mdata-select)) + (hs-hide-block-at-point t)))) (goto-char maxp)) (defmacro hs-life-goes-on (&rest body) ------------------------------------------------------------ revno: 103355 committer: Chong Yidong branch nick: trunk timestamp: Sat 2011-02-19 16:23:51 -0500 message: Improvements to vc-bzr conffile handling and pull/merge support. * vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted. (vc-bzr-branch-conf): New function, similar to vc-bzr--branch-conf but returning an alist. Ignore comments in bzr conffile. (vc-bzr-pull, vc-bzr-merge-branch): Use vc-bzr-branch-conf. (vc-bzr-error-regex-alist): New var. (vc-bzr-merge-branch): Use it to highlight the pull/merge buffer. * progmodes/compile.el (compilation--flush-directory-cache): Handle the case where cdr of compilation--flush-directory-cache points to no buffer, which can occur if we previously switched to compilation-mode in a pregenerated buffer. * vc/vc-dispatcher.el (vc-do-async-command): Bind inhibit-read-only to t. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-19 20:44:34 +0000 +++ lisp/ChangeLog 2011-02-19 21:23:51 +0000 @@ -1,3 +1,20 @@ +2011-02-19 Chong Yidong + + * vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted. + (vc-bzr-branch-conf): New function, similar to vc-bzr--branch-conf + but returning an alist. Ignore comments in bzr conffile. + (vc-bzr-pull, vc-bzr-merge-branch): Use vc-bzr-branch-conf. + (vc-bzr-error-regex-alist): New var. + (vc-bzr-merge-branch): Use it to highlight the pull/merge buffer. + + * vc/vc-dispatcher.el (vc-do-async-command): Bind + inhibit-read-only to t. + + * progmodes/compile.el (compilation--flush-directory-cache): + Handle the case where cdr of compilation--flush-directory-cache + points to no buffer, which can occur if we previously switched to + compilation-mode in a pregenerated buffer. + 2011-02-19 Kenichi Handa * mail/rmailmm.el (rmail-mime-find-header-encoding): Be sure to === modified file 'lisp/progmodes/compile.el' --- lisp/progmodes/compile.el 2011-02-02 17:14:49 +0000 +++ lisp/progmodes/compile.el 2011-02-19 21:23:51 +0000 @@ -838,6 +838,7 @@ ((or (not compilation--previous-directory-cache) (<= (car compilation--previous-directory-cache) start))) ((or (not (cdr compilation--previous-directory-cache)) + (null (marker-buffer (cdr compilation--previous-directory-cache))) (<= (cdr compilation--previous-directory-cache) start)) (set-marker (car compilation--previous-directory-cache) start)) (t (setq compilation--previous-directory-cache nil)))) === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2011-02-14 01:49:24 +0000 +++ lisp/vc/vc-bzr.el 2011-02-19 21:23:51 +0000 @@ -141,12 +141,20 @@ (let ((root (vc-find-root file vc-bzr-admin-checkout-format-file))) (when root (vc-file-setprop file 'bzr-root root))))) -(defun vc-bzr--branch-conf (file) - "Return the Bzr branch config for file FILE, as a string." - (with-temp-buffer - (insert-file-contents - (expand-file-name vc-bzr-admin-branchconf (vc-bzr-root file))) - (buffer-string))) +(defun vc-bzr-branch-conf (file) + "Return the Bazaar branch settings for file FILE, as an alist. +Each element of the returned alist has the form (NAME . VALUE), +which are the name and value of a Bazaar setting, as strings. + +The settings are read from the file \".bzr/branch/branch.conf\" +in the repository root directory of FILE." + (let (settings) + (with-temp-buffer + (insert-file-contents + (expand-file-name vc-bzr-admin-branchconf (vc-bzr-root file))) + (while (re-search-forward "^\\([^#=][^=]*?\\) *= *\\(.*\\)$" nil t) + (push (cons (match-string 1) (match-string 2)) settings))) + settings)) (require 'sha1) ;For sha1-program @@ -276,6 +284,13 @@ (when rootdir (file-relative-name filename* rootdir)))) +(defvar vc-bzr-error-regex-alist + '(("^\\( M[* ]\\|+N \\|-D \\|\\| \\*\\|R[M ] \\) \\(.+\\)" 2 nil nil 1) + ("^C \\(.+\\)" 2) + ("^Text conflict in \\(.+\\)" 1 nil nil 2) + ("^Using saved parent location: \\(.+\\)" 1 nil nil 0)) + "Value of `compilation-error-regexp-alist' in *vc-bzr* buffers.") + (defun vc-bzr-pull (prompt) "Pull changes into the current Bzr branch. Normally, this runs \"bzr pull\". However, if the branch is a @@ -283,19 +298,18 @@ location from which to pull or update, or if PROMPT is non-nil, prompt for the Bzr command to run." (let* ((vc-bzr-program vc-bzr-program) - (branch-conf (vc-bzr--branch-conf default-directory)) + (branch-conf (vc-bzr-branch-conf default-directory)) ;; Check whether the branch is bound. - (bound (string-match "^bound\\s-*=\\s-*True" branch-conf)) + (bound (assoc "bound" branch-conf)) + (bound (and bound (equal "true" (downcase (cdr bound))))) ;; If we need to do a "bzr pull", check for a parent. If it ;; does not exist, bzr will need a pull location. - (parent (unless bound - (string-match - "^parent_location\\s-*=\\s-*[^\n[:space:]]+" - branch-conf))) + (has-parent (unless bound + (assoc "parent_location" branch-conf))) (command (if bound "update" "pull")) args) ;; If necessary, prompt for the exact command. - (when (or prompt (not (or bound parent))) + (when (or prompt (not (or bound has-parent))) (setq args (split-string (read-shell-command "Bzr pull command: " @@ -305,28 +319,33 @@ (setq vc-bzr-program (car args) command (cadr args) args (cddr args))) - (vc-set-async-update - (apply 'vc-bzr-async-command command args)))) + (let ((buf (apply 'vc-bzr-async-command command args))) + (with-current-buffer buf + (vc-exec-after + `(progn + (let ((compilation-error-regexp-alist + vc-bzr-error-regex-alist)) + (compilation-mode)) + (set (make-local-variable 'compilation-error-regexp-alist) + vc-bzr-error-regex-alist)))) + (vc-set-async-update buf)))) (defun vc-bzr-merge-branch () "Merge another Bzr branch into the current one. Prompt for the Bzr command to run, providing a pre-defined merge source (an upstream branch or a previous merge source) as a default if it is available." - (let* ((branch-conf (vc-bzr--branch-conf default-directory)) + (let* ((branch-conf (vc-bzr-branch-conf default-directory)) ;; "bzr merge" without an argument defaults to submit_branch, ;; then parent_location. Extract the specific location and ;; add it explicitly to the command line. + (setting nil) (location (cond - ((string-match - "^submit_branch\\s-*=\\s-*\\(?:file://\\)?\\([^\n[:space:]]+\\)$" - branch-conf) - (match-string 1 branch-conf)) - ((string-match - "^parent_location\\s-*=\\s-*\\(?:file://\\)?\\([^\n[:space:]]+\\)$" - branch-conf) - (match-string 1 branch-conf)))) + ((setq setting (assoc "submit_branch" branch-conf)) + (cdr setting)) + ((setq setting (assoc "parent_location" branch-conf)) + (cdr setting)))) (cmd (split-string (read-shell-command @@ -338,8 +357,16 @@ (vc-bzr-program (car cmd)) (command (cadr cmd)) (args (cddr cmd))) - (vc-set-async-update - (apply 'vc-bzr-async-command command args)))) + (let ((buf (apply 'vc-bzr-async-command command args))) + (with-current-buffer buf + (vc-exec-after + `(progn + (let ((compilation-error-regexp-alist + vc-bzr-error-regex-alist)) + (compilation-mode)) + (set (make-local-variable 'compilation-error-regexp-alist) + vc-bzr-error-regex-alist)))) + (vc-set-async-update buf)))) (defun vc-bzr-status (file) "Return FILE status according to Bzr. === modified file 'lisp/vc/vc-dispatcher.el' --- lisp/vc/vc-dispatcher.el 2011-01-29 21:19:21 +0000 +++ lisp/vc/vc-dispatcher.el 2011-02-19 21:23:51 +0000 @@ -363,6 +363,7 @@ ROOT should be the directory in which the command should be run. Display the buffer in some window, but don't select it." (let* ((dir default-directory) + (inhibit-read-only t) window new-window-start) (setq buffer (get-buffer-create buffer)) (if (get-buffer-process buffer) ------------------------------------------------------------ revno: 103354 committer: Glenn Morris branch nick: trunk timestamp: Sat 2011-02-19 12:44:34 -0800 message: dired-x no longer requires dired-aux. * lisp/dired-x.el: Don't require dired-aux. (dired-do-create-files, dired-mark-read-regexp) (dired-do-create-files-regexp): Autoload from dired-aux. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-19 20:36:54 +0000 +++ lisp/ChangeLog 2011-02-19 20:44:34 +0000 @@ -22,6 +22,10 @@ 2011-02-19 Glenn Morris + * dired-x.el: Don't require dired-aux. + (dired-do-create-files, dired-mark-read-regexp) + (dired-do-create-files-regexp): Autoload from dired-aux. + * dired-x.el (dired-find-buffer-nocreate): Merge into dired.el. * dired.el (dired-find-buffer-nocreate): Merge dired-x version. === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-02-19 20:36:54 +0000 +++ lisp/dired-x.el 2011-02-19 20:44:34 +0000 @@ -53,15 +53,10 @@ ;;; Code: -;; LOAD. - ;; This is a no-op if dired-x is being loaded via `dired-load-hook', ;; but maybe not if a dired-x function is being autoloaded. (require 'dired) -;; We will redefine some functions and also need some macros. -(require 'dired-aux) - ;;; User-defined variables. (defgroup dired-x nil @@ -1149,6 +1144,8 @@ ; (trailing slash!) name2 ok-if-already-exists))) +(autoload 'dired-do-create-files "dired-aux") + ;;;###autoload (defun dired-do-relsymlink (&optional arg) "Relative symlink all marked (or next ARG) files into a directory. @@ -1166,6 +1163,9 @@ (dired-do-create-files 'relsymlink #'dired-make-relative-symlink "RelSymLink" arg dired-keep-marker-relsymlink)) +(autoload 'dired-mark-read-regexp "dired-aux") +(autoload 'dired-do-create-files-regexp "dired-aux") + (defun dired-do-relsymlink-regexp (regexp newname &optional arg whole-name) "RelSymlink all marked files containing REGEXP to NEWNAME. See functions `dired-do-rename-regexp' and `dired-do-relsymlink' ------------------------------------------------------------ revno: 103353 committer: Glenn Morris branch nick: trunk timestamp: Sat 2011-02-19 12:36:54 -0800 message: Merge dired-x's dired-find-buffer-nocreate into dired.el. * lisp/dired-x.el (dired-find-buffer-nocreate): Merge into dired.el. * lisp/dired.el (dired-find-buffer-nocreate): Merge dired-x version. * doc/misc/dired-x.texi (Technical Details): No longer redefines dired-find-buffer-nocreate. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-02-19 19:40:59 +0000 +++ doc/misc/ChangeLog 2011-02-19 20:36:54 +0000 @@ -51,8 +51,8 @@ 2011-02-19 Glenn Morris * dired-x.texi (Technical Details): No longer redefines dired-add-entry, - dired-initial-position, dired-clean-up-after-deletion, or - dired-read-shell-command. + dired-initial-position, dired-clean-up-after-deletion, + dired-read-shell-command, or dired-find-buffer-nocreate. 2011-02-18 Glenn Morris === modified file 'doc/misc/dired-x.texi' --- doc/misc/dired-x.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/dired-x.texi 2011-02-19 20:36:54 +0000 @@ -174,19 +174,19 @@ @node Technical Details, , Features, Introduction @section Technical Details -@cindex Redefined functions +@cindex Modified functions @cindex @file{dired-aux.el} -When loaded this code @emph{redefines} the standard @file{dired.el} -function @code{dired-find-buffer-nocreate}. In addition, once -@file{dired-x.el} is loaded, the following Dired functions offer -additional features. @code{dired-add-entry} obeys Dired Omit mode -(@pxref{Omitting Files in Dired}), if it is active. -@code{dired-initial-position} obeys @code{dired-find-subdir} -(@pxref{Miscellaneous Commands}). @code{dired-clean-up-after-deletion} -respects the value of @code{dired-clean-up-buffers-too}. -@code{dired-read-shell-command} uses @code{dired-guess-shell-command} -(@pxref{Shell Command Guessing}) to offer a smarter default command. +When @file{dired-x.el} is loaded, some standard Dired functions from +@file{dired.el} and @file{dired-aux.el} offer additional features. +@code{dired-add-entry} obeys Dired Omit mode (@pxref{Omitting Files in +Dired}), if it is active. @code{dired-find-buffer-nocreate} and +@code{dired-initial-position} respect the value of +@code{dired-find-subdir} (@pxref{Miscellaneous Commands}). +@code{dired-clean-up-after-deletion} respects the value of +@code{dired-clean-up-buffers-too}. @code{dired-read-shell-command} uses +@code{dired-guess-shell-command} (@pxref{Shell Command Guessing}) to +offer a smarter default command. @node Installation, Omitting Files in Dired, Introduction, Top @chapter Installation === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-19 19:40:59 +0000 +++ lisp/ChangeLog 2011-02-19 20:36:54 +0000 @@ -22,6 +22,9 @@ 2011-02-19 Glenn Morris + * dired-x.el (dired-find-buffer-nocreate): Merge into dired.el. + * dired.el (dired-find-buffer-nocreate): Merge dired-x version. + * dired-x.el (dired-read-shell-command): Merge into dired-aux's version. * dired-aux.el (dired-read-shell-command): Merge dired-x's version. === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-02-19 19:20:38 +0000 +++ lisp/dired-x.el 2011-02-19 20:36:54 +0000 @@ -42,13 +42,12 @@ ;; ;; (dired-omit-mode 1) ;; )) ;; -;; At load time dired-x.el will install itself, redefine some functions, and -;; bind some dired keys. +;; At load time dired-x.el will install itself and bind some dired keys. +;; Some dired.el and dired-aux.el functions have extra features if +;; dired-x is loaded. ;; User customization: M-x customize-group RET dired-x RET. -;; When loaded this code redefines dired.el's dired-find-buffer-nocreate. - ;; *Please* see the `dired-x' info pages for more details. @@ -1306,31 +1305,6 @@ ;;; MISCELLANEOUS INTERNAL FUNCTIONS. -(declare-function dired-old-find-buffer-nocreate "dired-x") - -(or (fboundp 'dired-old-find-buffer-nocreate) - (fset 'dired-old-find-buffer-nocreate - (symbol-function 'dired-find-buffer-nocreate))) - -;; REDEFINE. -;; Redefines dired.el's version of `dired-find-buffer-nocreate' -(defun dired-find-buffer-nocreate (dirname &optional mode) - (if (and dired-find-subdir - ;; don't try to find a wildcard as a subdirectory - (string-equal dirname (file-name-directory dirname))) - (let* ((cur-buf (current-buffer)) - (buffers (nreverse - (dired-buffers-for-dir (expand-file-name dirname)))) - (cur-buf-matches (and (memq cur-buf buffers) - ;; wildcards must match, too: - (equal dired-directory dirname)))) - ;; We don't want to switch to the same buffer--- - (setq buffers (delq cur-buf buffers));;need setq with delq - (or (car (sort buffers #'dired-buffer-more-recently-used-p)) - ;; ---unless it's the only possibility: - (and cur-buf-matches cur-buf))) - (dired-old-find-buffer-nocreate dirname mode))) - ;; This should be a builtin (defun dired-buffer-more-recently-used-p (buffer1 buffer2) "Return t if BUFFER1 is more recently used than BUFFER2. === modified file 'lisp/dired.el' --- lisp/dired.el 2011-02-19 18:55:15 +0000 +++ lisp/dired.el 2011-02-19 20:36:54 +0000 @@ -847,28 +847,47 @@ ;; killed buffer, it is removed from this list. "Alist of expanded directories and their associated dired buffers.") +(defvar dired-find-subdir) + +;; FIXME add a doc-string, and document dired-x extensions. (defun dired-find-buffer-nocreate (dirname &optional mode) ;; This differs from dired-buffers-for-dir in that it does not consider ;; subdirs of default-directory and searches for the first match only. ;; Also, the major mode must be MODE. - (setq dirname (expand-file-name dirname)) - (let (found (blist dired-buffers)) ; was (buffer-list) - (or mode (setq mode 'dired-mode)) - (while blist - (if (null (buffer-name (cdr (car blist)))) - (setq blist (cdr blist)) - (with-current-buffer (cdr (car blist)) - (if (and (eq major-mode mode) - dired-directory ;; nil during find-alternate-file - (equal dirname - (expand-file-name - (if (consp dired-directory) - (car dired-directory) - dired-directory)))) - (setq found (cdr (car blist)) - blist nil) - (setq blist (cdr blist)))))) - found)) + (if (and (featurep 'dired-x) + dired-find-subdir + ;; Don't try to find a wildcard as a subdirectory. + (string-equal dirname (file-name-directory dirname))) + (let* ((cur-buf (current-buffer)) + (buffers (nreverse + (dired-buffers-for-dir (expand-file-name dirname)))) + (cur-buf-matches (and (memq cur-buf buffers) + ;; Wildcards must match, too: + (equal dired-directory dirname)))) + ;; We don't want to switch to the same buffer--- + (setq buffers (delq cur-buf buffers)) + (or (car (sort buffers #'dired-buffer-more-recently-used-p)) + ;; ---unless it's the only possibility: + (and cur-buf-matches cur-buf))) + ;; No dired-x, or dired-find-subdir nil. + (setq dirname (expand-file-name dirname)) + (let (found (blist dired-buffers)) ; was (buffer-list) + (or mode (setq mode 'dired-mode)) + (while blist + (if (null (buffer-name (cdr (car blist)))) + (setq blist (cdr blist)) + (with-current-buffer (cdr (car blist)) + (if (and (eq major-mode mode) + dired-directory ;; nil during find-alternate-file + (equal dirname + (expand-file-name + (if (consp dired-directory) + (car dired-directory) + dired-directory)))) + (setq found (cdr (car blist)) + blist nil) + (setq blist (cdr blist)))))) + found))) ;; Read in a new dired buffer ------------------------------------------------------------ revno: 103352 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2011-02-19 21:56:29 +0200 message: Adapt and fix the MS-DOS port due to gnulib imports. msdos/depfiles.bat: New file. msdos/sedlibmk.inp: New file. msdos/sedlibcf.inp: New file. msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS. (BUILT_EMACS): Rename from BUILT-EMACS. msdos/sed6.inp (MAKEINFO): Edit to "makeinfo". (ENVADD): Adjust to MAKEINFO_OPTS. (texinputdir): Don't edit. msdos/sed3v2.inp (-DVERSION): Edit out. (LOADLIBES): Don't edit to empty. msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME || BROKEN_MKTIME" stuff -- it's no longer in src/config.in. (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV) (HAVE__BOOL): Edit to 1. (VERSION, inline, restrict): Edit for DJGPP. (my_strftime): Edit to nstrftime. msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty. (@true): Edit to "@rem". (move-if-change): Edit to "update". (echo): Edit to "djecho". (cd $(lib) && ...): Edit to "$(MAKE) -C ...". (LIBOBJS): Edit to empty. ($(libsrc)/make-docfile): Two new edits, one each for every invocation of make-docfile. (move-if-change): Fix edit. Remove some unused switches from $(ALL_CFLAGS), to make the GCC command line shorter. msdos/mainmake.v2 (version): Remove, no longer needed (config.in defines VERSION). (all): Add lib. (lib): New target and recipe. (lib-src): Depend on lib. (src): Depend on lib and lib-src. (clean, mostlyclean, distclean, maintainer-clean, extraclean) (bootstrap-clean): Recurse into lib. (lib, lib-src, src): Specify "all" as an explicit target. .bzrignore: Ignore cxxdefs.h and lib/*.in-h files. Add lib/deps/. config.bat: Configure in `lib'. Generate *.Po files in lib/deps. src/termcap.c (tputs): Don't declare baud_rate. src/s/msdos.h (strtold): Define to _strtold. diff: === modified file '.bzrignore' --- .bzrignore 2011-02-16 00:33:44 +0000 +++ .bzrignore 2011-02-19 16:53:10 +0000 @@ -29,6 +29,7 @@ subdirs.el TAGS TAGS-LISP +cxxdefs.h info/* admin/unidata/unidata.txt leim/leim-list.el @@ -36,6 +37,7 @@ leim/changed.misc leim/changed.tit lib/.deps/ +lib/deps/ lib/arg-nonnull.h lib/c++defs.h lib/getopt.h @@ -43,6 +45,13 @@ lib/time.h lib/unistd.h lib/warn-on-use.h +lib/getopt.in-h +lib/stdbool.in-h +lib/stddef.in-h +lib/stdlib.in-h +lib/time.in-h +lib/unistd.in-h +lib/cxxdefs.h lib-src/stamp-* lib-src/ctags lib-src/ctags.c === modified file 'ChangeLog' --- ChangeLog 2011-02-18 07:41:43 +0000 +++ ChangeLog 2011-02-19 16:53:10 +0000 @@ -1,3 +1,11 @@ +2011-02-19 Eli Zaretskii + + * .bzrignore: Ignore cxxdefs.h and lib/*.in-h files. + Add lib/deps/. + + * config.bat: Configure in `lib'. + Generate *.Po files in lib/deps. + 2011-02-18 Paul Eggert Import IRIX 6.5 getloadavg fixes from gnulib. === modified file 'admin/ChangeLog' --- admin/ChangeLog 2011-02-16 00:33:44 +0000 +++ admin/ChangeLog 2011-02-19 15:57:35 +0000 @@ -1,3 +1,7 @@ +2011-02-19 Eli Zaretskii + + * admin.el (set-version): Add msdos/sed2v2.inp. + 2011-02-16 Paul Eggert Remove no-longer needed getloadavg symbols. === modified file 'admin/admin.el' --- admin/admin.el 2011-01-31 19:36:08 +0000 +++ admin/admin.el 2011-02-19 15:57:35 +0000 @@ -77,6 +77,10 @@ (rx (and bol "#" (0+ blank) "define" (1+ blank) "VERSION" (1+ blank) (submatch (1+ (in "0-9.")))))) + (set-version-in-file root "msdos/sed2v2.inp" version + (rx (and bol "/^#undef " (1+ not-newline) + "define VERSION" (1+ space) + (submatch (1+ (in "0-9.")))))) (set-version-in-file root "nt/makefile.w32-in" version (rx (and "VERSION" (0+ space) "=" (0+ space) (submatch (1+ (in "0-9.")))))) === modified file 'config.bat' --- config.bat 2011-01-15 23:16:57 +0000 +++ config.bat 2011-02-19 16:53:10 +0000 @@ -2,7 +2,8 @@ rem ---------------------------------------------------------------------- rem Configuration script for MSDOS rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003 -rem 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +rem 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +rem Inc. rem This file is part of GNU Emacs. @@ -273,6 +274,25 @@ for %%d in (emacs lispref lispintro lispintr misc) do sed -f ../msdos/sed6.inp < %%d\Makefile.in > %%d\Makefile cd .. rem ---------------------------------------------------------------------- +Echo Configuring the lib directory... +If Exist c++defs.h update c++defs.h cxxdefs.h +cd lib +Rem Rename files like djtar on plain DOS filesystem would. +If Exist c++defs.h update c++defs.h cxxdefs.h +If Exist getopt.in.h update getopt.in.h getopt.in-h +If Exist stddef.in.h update stddef.in.h stddef.in-h +If Exist stdbool.in.h update stdbool.in.h stdbool.in-h +If Exist stdlib.in.h update stdlib.in.h stdlib.in-h +If Exist time.in.h update time.in.h time.in-h +If Exist unistd.in.h update unistd.in.h unistd.in-h +sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp +sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile +rm -f makefile.tmp +If Not Exist deps\stamp mkdir deps +If Not Exist deps\stamp for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f +If Not Exist deps\stamp echo deps-stamp > deps\stamp +cd .. +rem ---------------------------------------------------------------------- Echo Configuring the lisp directory... cd lisp If Exist gnus\.dir-locals.el update gnus/.dir-locals.el gnus/_dir-locals.el === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2011-01-25 04:08:28 +0000 +++ msdos/ChangeLog 2011-02-19 19:56:29 +0000 @@ -1,3 +1,50 @@ +2011-02-19 Eli Zaretskii + + * depfiles.bat: New file. + + * sedlibmk.inp: New file. + + * sedlibcf.inp: New file. + + * sedleim.inp (RUN_EMACS): Rename from RUN-EMACS. + (BUILT_EMACS): Rename from BUILT-EMACS. + + * sed6.inp (MAKEINFO): Edit to "makeinfo". + (ENVADD): Adjust to MAKEINFO_OPTS. + (texinputdir): Don't edit. + + * sed3v2.inp (-DVERSION): Edit out. + (LOADLIBES): Don't edit to empty. + + * sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME || + BROKEN_MKTIME" stuff -- it's no longer in src/config.in. + (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV) + (HAVE__BOOL): Edit to 1. + (VERSION, inline, restrict): Edit for DJGPP. + (my_strftime): Edit to nstrftime. + + * sed1v2.inp (NS_OBJC_OBJ): Edit to empty. + (@true): Edit to "@rem". + (move-if-change): Edit to "update". + (echo): Edit to "djecho". + (cd $(lib) && ...): Edit to "$(MAKE) -C ...". + (LIBOBJS): Edit to empty. + ($(libsrc)/make-docfile): Two new edits, one each for every + invocation of make-docfile. + (move-if-change): Fix edit. + Remove some unused switches from $(ALL_CFLAGS), to make the GCC + command line shorter. + + * mainmake.v2 (version): Remove, no longer needed (config.in + defines VERSION). + (all): Add lib. + (lib): New target and recipe. + (lib-src): Depend on lib. + (src): Depend on lib and lib-src. + (clean, mostlyclean, distclean, maintainer-clean, extraclean) + (bootstrap-clean): Recurse into lib. + (lib, lib-src, src): Specify "all" as an explicit target. + 2011-01-08 Glenn Morris * sedleim.inp (RUN-EMACS): -batch implies --no-init-file. === added file 'msdos/depfiles.bat' --- msdos/depfiles.bat 1970-01-01 00:00:00 +0000 +++ msdos/depfiles.bat 2011-02-19 16:53:10 +0000 @@ -0,0 +1,25 @@ +@echo off +rem ---------------------------------------------------------------------- +rem Auxiliary script for MSDOS, run by ../config.bat +rem Copyright (C) 2011 Free Software Foundation, Inc. + +rem This file is part of GNU Emacs. + +rem GNU Emacs is free software: you can redistribute it and/or modify +rem it under the terms of the GNU General Public License as published by +rem the Free Software Foundation, either version 3 of the License, or +rem (at your option) any later version. + +rem GNU Emacs is distributed in the hope that it will be useful, +rem but WITHOUT ANY WARRANTY; without even the implied warranty of +rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +rem GNU General Public License for more details. + +rem You should have received a copy of the GNU General Public License +rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/. + +rem ---------------------------------------------------------------------- + +echo %1 | sed -e "s,^,@echo # dummy > deps\\," -e "s,\.c,.Po," > tdepfile.bat +call tdepfile +del tdepfile.bat === modified file 'msdos/mainmake.v2' --- msdos/mainmake.v2 2011-01-25 04:08:28 +0000 +++ msdos/mainmake.v2 2011-02-19 17:54:18 +0000 @@ -63,9 +63,6 @@ # Generate a full pathname of the top-level installation directory top_srcdir := $(subst \,/,$(shell cd)) -# Find out which version of Emacs this is. -version := ${shell sed -n -e '/^static const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c} - # Q: Do we need to bootstrap? # A: Only if we find admin/admin.el, i.e. we are building out of # a VCS-checkout (not a release) and src/b-emacs.exe does not exist. @@ -82,11 +79,16 @@ # compiled lisp files are part of the distribution. (If we are # bootstrapping, the src target will run Make in `lisp' as well.) # leim is not included because it is part of the src target. -all: lib-src src emacs misc lispref lispintro - -lib-src: FRC +all: lib lib-src src emacs misc lispref lispintro + +lib: FRC + cd lib + $(MAKE) top_srcdir=${top_srcdir} all + cd .. + +lib-src: lib FRC cd lib-src - $(MAKE) top_srcdir=${top_srcdir} version=${version} + $(MAKE) top_srcdir=${top_srcdir} all cd .. # Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which @@ -98,9 +100,9 @@ # file src/foo.c forces dumping a new bootstrap-emacs, then re-byte-compiling # all preloaded elisp files, and only then dump the actual src/emacs, which # is not wrong, but is overkill in 99.99% of the cases. -src: FRC +src: lib lib-src FRC cd src - $(MAKE) top_srcdir=${top_srcdir} BOOTSTRAPEMACS="${boot}" + $(MAKE) top_srcdir=${top_srcdir} BOOTSTRAPEMACS="${boot}" all djecho -s '/-geometry/s,^.*,set environment HOME $(top_srcdir),' \ '/environment *TERM/s/^.*/set environment TERM internal/' \ >gdb.sed @@ -168,6 +170,9 @@ @echo "We don't have any tests for GNU Emacs yet." clean mostlyclean: + cd lib + $(MAKE) $(MFLAGS) $@ + cd .. cd lib-src $(MAKE) $(MFLAGS) $@ cd .. @@ -199,6 +204,9 @@ $(MAKE) $(MFLAGS) $@ if exist bootlisp rm -f bootlisp cd .. + cd lib + $(MAKE) $(MFLAGS) $@ + cd .. cd lib-src $(MAKE) $(MFLAGS) $@ cd .. @@ -228,6 +236,9 @@ cd src $(MAKE) $(MFLAGS) $@ cd .. + cd lib + $(MAKE) $(MFLAGS) $@ + cd .. cd lib-src $(MAKE) $(MFLAGS) $@ cd .. @@ -257,6 +268,9 @@ .PHONY: bootstrap bootstrap-clean: FRC + cd lib + $(MAKE) $(MFLAGS) $@ + cd .. cd src $(MAKE) $(MFLAGS) $@ cd .. === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2011-01-25 04:08:28 +0000 +++ msdos/sed1v2.inp 2011-02-19 19:49:10 +0000 @@ -35,7 +35,7 @@ /^LIBES *=/,/^ *$/ { s/@[^@\n]*@//g } -/^LIBOBJS *=/s/@[^@\n]*@/getloadavg.o/ +/^LIBOBJS *=/s/@[^@\n]*@// /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// /^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@// @@ -98,6 +98,7 @@ /^ns_appbindir *=/s/@ns_appbindir@// /^ns_appsrc *=/s/@ns_appsrc@// /^NS_OBJ *=/s/@NS_OBJ@// +/^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@// /^NS_SUPPORT *=/s/@NS_SUPPORT@// /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// /^LIBRESOLV *=/s/@LIBRESOLV@// @@ -130,7 +131,8 @@ /^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h! /^S_FILE *=/s!@S_FILE@!$(srcdir)/s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// -/^.\$(libsrc)\/make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! +/^.\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o ../etc/DOC! +/^.\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp! /^.\$(libsrc)\/make-doc/s!>.*$!! /^[ ]*$/d /^ if test -f/,/^ fi$/c\ @@ -145,6 +147,13 @@ stubedit emacs.exe minstack=2048k s/ || exit 1\; \\$// s/ || true\; \\$// +s/ @true *$/ @rem/ +s/^ [^ ]*move-if-change / update / +/^ echo[ ][ ]*timestamp/s/echo /djecho / +/^ .*djecho timestamp/a\ + @rm -f gl-tmp +/^ cd \$(lib) && \$(MAKE)/c\ + $(MAKE) $(MFLAGS) -C $(lib) libgnu.a /^RUN_TEMACS *=/s|`/bin/pwd`|.| /^ *@\$(MKDEPDIR) *$/d /^ mv \.\/\.gdbinit/d @@ -176,4 +185,11 @@ /^ @\{0,1\}cd ..\/lisp;.*[^\]$/s|$|\; cd ../src| /^ *THEFILE=/s|$|\; cd ../src| /^ echo.* buildobj.h/s|echo |djecho | - +# Make the GCC command line fit one screen line +/^[ ][ ]*\$(C_SWITCH_X_SYSTEM)/d +/^[ ][ ]*\$(GCONF_CFLAGS)/d +/^[ ][ ]*\$(LIBGNUTLS_CFLAGS)/d +s/\$(LIBOTF_CFLAGS) \$(M17N_FLT_CFLAGS) \$(DEPFLAGS) // +s/ \$(C_SWITCH_X_SITE)// +s/ \$(DBUS_CFLAGS)// +s| -I\$(srcdir)/../lib|| === modified file 'msdos/sed2v2.inp' --- msdos/sed2v2.inp 2011-01-25 04:08:28 +0000 +++ msdos/sed2v2.inp 2011-02-19 19:41:00 +0000 @@ -34,6 +34,8 @@ /^#undef HAVE_FREXP *$/s/^.*$/#define HAVE_FREXP 1/ /^#undef HAVE_FMOD *$/s/^.*$/#define HAVE_FMOD 1/ /^#undef HAVE_RINT *$/s/^.*$/#define HAVE_RINT 1/ +/^#undef HAVE_ATTRIBUTE_ALIGNED *$/s/^.*$/#define HAVE_ATTRIBUTE_ALIGNED 1/ +/^#undef HAVE_C99_STRTOLD *$/s/^.*$/#define HAVE_C99_STRTOLD 1/ /^#undef HAVE_CBRT *$/s/^.*$/#define HAVE_CBRT 1/ /^#undef HAVE_DIFFTIME *$/s/^.*$/#define HAVE_DIFFTIME 1/ /^#undef HAVE_FPATHCONF *$/s/^.*$/#define HAVE_FPATHCONF 1/ @@ -56,8 +58,14 @@ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ +/^#undef VERSION/s/^.*$/#define VERSION "24.0.50"/ +/^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ /^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/ +/^#undef HAVE__BOOL/s/^.*$/#define HAVE__BOOL 1/ +/^#undef inline/s/^.*$/#define inline __inline__/ +/^#undef my_strftime/s/^.*$/#define my_strftime nstrftime/ +/^#undef restrict/s/^.*$/#define restrict __restrict/ /^#undef GNU_MALLOC *$/s/^.*$/#define GNU_MALLOC 1/ /^#undef REL_ALLOC *$/s/^.*$/#define REL_ALLOC 1/ @@ -69,15 +77,6 @@ s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"! s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/ s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/ -# ------------------------------------------------------------ -# Without this ifndef, gcc -E -traditional barfs with GCC 3.0 -# on the line which says if ! HAVE_MKTIME... -# ------------------------------------------------------------ -/^#if ! HAVE_MKTIME || BROKEN_MKTIME/i\ -#ifndef __DJGPP__ -/^#define mktime emacs_mktime/a\ -#endif - /^#undef HAVE_STDINT_H/c\ #if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3\ #define HAVE_STDINT_H 1\ === modified file 'msdos/sed3v2.inp' --- msdos/sed3v2.inp 2011-01-25 04:08:28 +0000 +++ msdos/sed3v2.inp 2011-02-19 17:54:18 +0000 @@ -18,7 +18,7 @@ /^# DIST: /d /^SHELL *=/s/^/# / /^CC *=/s/=.*$/=gcc/ -/-DVERSION=/s/@version@/\${version}/ +s/-DVERSION[^ ]* // /^configname *=/s/=.*$/=msdos/ /^archlibdir *=/s!=.*$!=/emacs/bin! /^bindir *=/s!=.*$!=/emacs/bin! @@ -40,7 +40,6 @@ /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@// /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// -/^LOADLIBES *=/s!=.*$!=! /^ALLOCA *=/s!@ALLOCA@!! /^EXEEXT *=/s!@EXEEXT@!! /^GETOPT_H *=/s!@GETOPT_H@!getopt.h! === modified file 'msdos/sed6.inp' --- msdos/sed6.inp 2011-01-25 04:08:28 +0000 +++ msdos/sed6.inp 2011-02-19 19:41:00 +0000 @@ -18,13 +18,11 @@ # ---------------------------------------------------------------------- /^srcdir *=/s/@[^@\n]*@/./ /^VPATH *=/s/@[^@\n]*@/./ -/^ENVADD/c\ +/^MAKEINFO *=/s/@[^@\n]*@/makeinfo/ +/^ENVADD/,/^$/c\ ENVADD =\ export TEXINPUTS := $(srcdir)";"$(TEXINPUTS)\ -export MAKEINFO := $(MAKEINFO) -I$(srcdir) -/^texinputdir/c\ -texinputdir =\ -export texinputdir := $(srcdir)";"$(TEXINPUTS) +export MAKEINFO := $(MAKEINFO) $(MAKEINFO_OPTS) /^SHELL *=/s/^/# / /^elisp.dvi:/,/^$/ { /^ *if \[ *\a${permuted_index}/,/^ *fi *$/c\ === modified file 'msdos/sedleim.inp' --- msdos/sedleim.inp 2011-01-25 04:08:28 +0000 +++ msdos/sedleim.inp 2011-02-19 19:41:00 +0000 @@ -31,9 +31,9 @@ s|\([ ]\)echo|\1djecho|g /^ @true *$/d -/RUN-EMACS *=/,/^$/c\ +/RUN_EMACS *=/,/^$/c\ export EMACSLOADPATH=${buildlisppath}\ -RUN-EMACS = ${BUILT-EMACS} -batch --no-site-file +RUN_EMACS = ${BUILT_EMACS} -batch --no-site-file /^ cd ../c\ ${MAKE} -C ../src ${MFLAGS} emacs === added file 'msdos/sedlibcf.inp' --- msdos/sedlibcf.inp 1970-01-01 00:00:00 +0000 +++ msdos/sedlibcf.inp 2011-02-19 16:05:27 +0000 @@ -0,0 +1,22 @@ +# -sedlibcf.inp----------------------------------------------------------- +# Configuration script for lib/Makefile.in under DJGPP v2.x +# +# This script is run by config.bat to account for renaming of +# files whose names are invalid on DOS 8+3 filesystems. +# ---------------------------------------------------------------------- +# +# Copyright (C) 2011 Free Software Foundation, Inc. +# +# This file is part of GNU Emacs. +# +# This file is free software; as a special exception, the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# ---------------------------------------------------------------------- +s/c++defs/cxxdefs/g +s/\([a-zA-Z0-9_]*\)\.in\.h/\1.in-h/g === added file 'msdos/sedlibmk.inp' --- msdos/sedlibmk.inp 1970-01-01 00:00:00 +0000 +++ msdos/sedlibmk.inp 2011-02-19 19:41:00 +0000 @@ -0,0 +1,312 @@ +# -sedlibmk.inp----------------------------------------------------------- +# Configuration script for lib/Makefile under DJGPP v2.x +# ---------------------------------------------------------------------- +# +# Copyright (C) 2011 Free Software Foundation, Inc. +# +# This file is part of GNU Emacs. +# +# This file is free software; as a special exception, the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# ---------------------------------------------------------------------- +# +# Replace @..@ constants. +/^\# @configure_input@/s!@configure_input@!lib/Makefile. Generated from Makefile.in by config.bat! +/^@SET_MAKE@$/s/@SET_MAKE@// +/^VPATH *=/s/@[^@\n]*@/./ +s/@PACKAGE@/emacs/ +/^am__cd *=/c\ +am__cd = cd +/^ALLOCA *=/s/@[^@\n]*@// +/^ALSA_CFLAGS *=/s/@[^@\n]*@// +/^ALSA_LIBS *=/s/@[^@\n]*@// +/^AWK *=/s/@[^@\n]*@/gawk/ +/^CANNOT_DUMP *=/s/@[^@\n]*@/no/ +/^CC *=/s/@[^@\n]*@/gcc/ +/^CPP *=/s/@[^@\n]*@/gcc -e/ +/^CPPFLAGS *=/s/@[^@\n]*@// +/^CCDEPMODE *=/s/@[^@\n]*@/depmode=gcc3/ +/^CFLAGS *=/s/@[^@\n]*@/-g -O2/ +/^CYGPATH_W *=/s/@[^@\n]*@// +/^CYGWIN_OBJ *=/s/@[^@\n]*@// +/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// +/^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// +/^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@// +/^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// +/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@// +/^DEFS *=/s/@[^@\n]*@/-DHAVE_CONFIG_H/ +/^DEPDIR *=/s/@[^@\n]*@/deps/ +/^DEPFLAGS *=/s/@[^@\n]*@/-MMD -MF ${DEPDIR}\/$*.d/ +/^ECHO_N *=/s/@[^@\n]*@/-n/ +/^EXEEXT *=/s/@[^@\n]*@/.exe/ +/^GETOPT_H *=/s/@[^@\n]*@/getopt.h/ +# +# Some GNULIB_* are replaced with zero even though DJGPP does not have +# these features. That's because the gnulib replacements cannot +# possibly work for DJGPP, so we prefer to fail the link than have a +# subtly botched executable. +/^GNULIB_ATOLL *=/s/@GNULIB_ATOLL@/1/ +/^GNULIB_CALLOC_POSIX *=/s/@GNULIB_CALLOC_POSIX@/0/ +/^GNULIB_CANONICALIZE_FILE_NAME *=/s/@GNULIB_CANONICALIZE_FILE_NAME@/0/ +/^GNULIB_CHOWN *=/s/@GNULIB_CHOWN@/0/ +/^GNULIB_CLOSE *=/s/@GNULIB_CLOSE@/0/ +/^GNULIB_DUP2 *=/s/@GNULIB_DUP2@/0/ +/^GNULIB_DUP3 *=/s/@GNULIB_DUP3@/1/ +/^GNULIB_ENVIRON *=/s/@GNULIB_ENVIRON@/0/ +/^GNULIB_EUIDACCESS *=/s/@GNULIB_EUIDACCESS@/0/ +/^GNULIB_FACCESSAT *=/s/@GNULIB_FACCESSAT@/0/ +/^GNULIB_FCHDIR *=/s/@GNULIB_FCHDIR@/0/ +/^GNULIB_FCHOWNAT *=/s/@GNULIB_FCHOWNAT@/0/ +/^GNULIB_FSYNC *=/s/@GNULIB_FSYNC@/0/ +/^GNULIB_FTRUNCATE *=/s/@GNULIB_FTRUNCATE@/0/ +/^GNULIB_GETCWD *=/s/@GNULIB_GETCWD@/0/ +/^GNULIB_GETDOMAINNAME *=/s/@GNULIB_GETDOMAINNAME@/0/ +/^GNULIB_GETDTABLESIZE *=/s/@GNULIB_GETDTABLESIZE@/0/ +/^GNULIB_GETGROUPS *=/s/@GNULIB_GETGROUPS@/0/ +/^GNULIB_GETHOSTNAME *=/s/@GNULIB_GETHOSTNAME@/0/ +/^GNULIB_GETLOADAVG *=/s/@GNULIB_GETLOADAVG@/1/ +/^GNULIB_GETLOGIN *=/s/@GNULIB_GETLOGIN@/0/ +/^GNULIB_GETLOGIN_R *=/s/@GNULIB_GETLOGIN_R@/0/ +/^GNULIB_GETPAGESIZE *=/s/@GNULIB_GETPAGESIZE@/0/ +/^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/ +/^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/ +/^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/0/ +/^GNULIB_LCHOWN *=/s/@GNULIB_LCHOWN@/0/ +/^GNULIB_LINK *=/s/@GNULIB_LINK@/0/ +/^GNULIB_LINKAT *=/s/@GNULIB_LINKAT@/0/ +/^GNULIB_LSEEK *=/s/@GNULIB_LSEEK@/0/ +/^GNULIB_MALLOC_POSIX *=/s/@GNULIB_MALLOC_POSIX@/0/ +/^GNULIB_MKDTEMP *=/s/@GNULIB_MKDTEMP@/0/ +/^GNULIB_MKOSTEMP *=/s/@GNULIB_MKOSTEMP@/0/ +/^GNULIB_MKOSTEMPS *=/s/@GNULIB_MKOSTEMPS@/0/ +/^GNULIB_MKSTEMP *=/s/@GNULIB_MKSTEMP@/0/ +/^GNULIB_MKSTEMPS *=/s/@GNULIB_MKSTEMPS@/0/ +/^GNULIB_MKTIME *=/s/@GNULIB_MKTIME@/0/ +/^GNULIB_NANOSLEEP *=/s/@GNULIB_NANOSLEEP@/0/ +/^GNULIB_PIPE *=/s/@GNULIB_PIPE@/0/ +/^GNULIB_PIPE2 *=/s/@GNULIB_PIPE2@/0/ +/^GNULIB_PREAD *=/s/@GNULIB_PREAD@/0/ +/^GNULIB_PTSNAME *=/s/@GNULIB_PTSNAME@/0/ +/^GNULIB_PUTENV *=/s/@GNULIB_PUTENV@/0/ +/^GNULIB_PWRITE *=/s/@GNULIB_PWRITE@/0/ +/^GNULIB_RANDOM_R *=/s/@GNULIB_RANDOM_R@/0/ +/^GNULIB_READLINK *=/s/@GNULIB_READLINK@/0/ +/^GNULIB_READLINKAT *=/s/@GNULIB_READLINKAT@/0/ +/^GNULIB_REALLOC_POSIX *=/s/@GNULIB_REALLOC_POSIX@/0/ +/^GNULIB_REALPATH *=/s/@GNULIB_REALPATH@/0/ +/^GNULIB_RMDIR *=/s/@GNULIB_RMDIR@/0/ +/^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/ +/^GNULIB_SETENV *=/s/@GNULIB_SETENV@/0/ +/^GNULIB_SLEEP *=/s/@GNULIB_SLEEP@/0/ +/^GNULIB_STRPTIME *=/s/@GNULIB_STRPTIME@/0/ +/^GNULIB_STRTOD *=/s/@GNULIB_STRTOD@/0/ +/^GNULIB_STRTOLL *=/s/@GNULIB_STRTOLL@/0/ +/^GNULIB_STRTOULL *=/s/@GNULIB_STRTOULL@/0/ +/^GNULIB_SYMLINK *=/s/@GNULIB_SYMLINK@/0/ +/^GNULIB_SYMLINKAT *=/s/@GNULIB_SYMLINKAT@/0/ +/^GNULIB_SYSTEM_POSIX *=/s/@GNULIB_SYSTEM_POSIX@/0/ +/^GNULIB_TIMEGM *=/s/@GNULIB_TIMEGM@/0/ +/^GNULIB_TIME_R *=/s/@GNULIB_TIME_R@/1/ +/^GNULIB_TTYNAME_R *=/s/@GNULIB_TTYNAME_R@/0/ +/^GNULIB_UNISTD_H_GETOPT *=/s/@GNULIB_UNISTD_H_GETOPT@/1/ +/^GNULIB_UNISTD_H_SIGPIPE *=/s/@GNULIB_UNISTD_H_SIGPIPE@/0/ +/^GNULIB_UNLINK *=/s/@GNULIB_UNLINK@/0/ +/^GNULIB_UNLINKAT *=/s/@GNULIB_UNLINKAT@/0/ +/^GNULIB_UNLOCKPT *=/s/@GNULIB_UNLOCKPT@/0/ +/^GNULIB_UNSETENV *=/s/@GNULIB_UNSETENV@/1/ +/^GNULIB_USLEEP *=/s/@GNULIB_USLEEP@/0/ +/^GNULIB_WRITE *=/s/@GNULIB_WRITE@/0/ +/^GNULIB__EXIT *=/s/@GNULIB__EXIT@/0/ +/^HAVE_ATOLL *=/s/@HAVE_ATOLL@/0/ +/^HAVE_CANONICALIZE_FILE_NAME *=/s/@HAVE_CANONICALIZE_FILE_NAME@/0/ +/^HAVE_CHOWN *=/s/@HAVE_CHOWN@/1/ +/^HAVE_DECL_ENVIRON *=/s/@HAVE_DECL_ENVIRON@/1/ +/^HAVE_DECL_FCHDIR *=/s/@HAVE_DECL_FCHDIR@/0/ +/^HAVE_DECL_GETDOMAINNAME *=/s/@HAVE_DECL_GETDOMAINNAME@/0/ +/^HAVE_DECL_GETLOADAVG *=/s/@HAVE_DECL_GETLOADAVG@/0/ +/^HAVE_DECL_GETLOGIN_R *=/s/@HAVE_DECL_GETLOGIN_R@/0/ +/^HAVE_DECL_GETPAGESIZE *=/s/@HAVE_DECL_GETPAGESIZE@/1/ +/^HAVE_DECL_GETUSERSHELL *=/s/@HAVE_DECL_GETUSERSHELL@/0/ +/^HAVE_DECL_LOCALTIME_R *=/s/@HAVE_DECL_LOCALTIME_R@/0/ +/^HAVE_DECL_SETENV *=/s/@HAVE_DECL_SETENV@/1/ +/^HAVE_DECL_TTYNAME_R *=/s/@HAVE_DECL_TTYNAME_R@/0/ +/^HAVE_DECL_UNSETENV *=/s/@HAVE_DECL_UNSETENV@/0/ +/^HAVE_DUP2 *=/s/@HAVE_DUP2@/1/ +/^HAVE_DUP3 *=/s/@HAVE_DUP3@/0/ +/^HAVE_EUIDACCESS *=/s/@HAVE_EUIDACCESS@/0/ +/^HAVE_FACCESSAT *=/s/@HAVE_FACCESSAT@/0/ +/^HAVE_FCHDIR *=/s/@HAVE_FCHDIR@/0/ +/^HAVE_FCHOWNAT *=/s/@HAVE_FCHOWNAT@/0/ +/^HAVE_FSYNC *=/s/@HAVE_FSYNC@/1/ +/^HAVE_FTRUNCATE *=/s/@HAVE_FTRUNCATE@/1/ +/^HAVE_GETDTABLESIZE *=/s/@HAVE_GETDTABLESIZE@/0/ +/^HAVE_GETGROUPS *=/s/@HAVE_GETGROUPS@/0/ +/^HAVE_GETHOSTNAME *=/s/@HAVE_GETHOSTNAME@/1/ +/^HAVE_GETLOGIN *=/s/@HAVE_GETLOGIN@/1/ +/^HAVE_GETOPT_H *=/s/@HAVE_GETOPT_H@/0/ +/^HAVE_GETPAGESIZE *=/s/@HAVE_GETPAGESIZE@/1/ +/^HAVE_GETSUBOPT *=/s/@HAVE_GETSUBOPT@/0/ +/^HAVE_GRANTPT *=/s/@HAVE_GRANTPT@/0/ +/^HAVE_LCHOWN *=/s/@HAVE_LCHOWN@/0/ +/^HAVE_LINK *=/s/@HAVE_LINK@/1/ +/^HAVE_LINKAT *=/s/@HAVE_LINKAT@/0/ +/^HAVE_MAKEINFO *=/s/@HAVE_MAKEINFO@/yes/ +/^HAVE_MKDTEMP *=/s/@HAVE_MKDTEMP@/0/ +/^HAVE_MKOSTEMP *=/s/@HAVE_MKOSTEMP@/0/ +/^HAVE_MKOSTEMPS *=/s/@HAVE_MKOSTEMPS@/0/ +/^HAVE_MKSTEMP *=/s/@HAVE_MKSTEMP@/1/ +/^HAVE_MKSTEMPS *=/s/@HAVE_MKSTEMPS@/0/ +/^HAVE_NANOSLEEP *=/s/@HAVE_NANOSLEEP@/0/ +/^HAVE_OS_H *=/s/@HAVE_OS_H@/0/ +/^HAVE_PIPE *=/s/@HAVE_PIPE@/0/ +/^HAVE_PIPE2 *=/s/@HAVE_PIPE2@/0/ +/^HAVE_PREAD *=/s/@HAVE_PREAD@/0/ +/^HAVE_PTSNAME *=/s/@HAVE_PTSNAME@/0/ +/^HAVE_PWRITE *=/s/@HAVE_PWRITE@/0/ +/^HAVE_RANDOM_H *=/s/@HAVE_RANDOM_H@/1/ +/^HAVE_RANDOM_R *=/s/@HAVE_RANDOM_R@/0/ +/^HAVE_READLINK *=/s/@HAVE_READLINK@/0/ +/^HAVE_READLINKAT *=/s/@HAVE_READLINKAT@/0/ +/^HAVE_REALPATH *=/s/@HAVE_REALPATH@/0/ +/^HAVE_RPMATCH *=/s/@HAVE_RPMATCH@/0/ +/^HAVE_SETENV *=/s/@HAVE_SETENV@/1/ +/^HAVE_SLEEP *=/s/@HAVE_SLEEP@/1/ +/^HAVE_STRPTIME *=/s/@HAVE_STRPTIME@/0/ +/^HAVE_STRTOD *=/s/@HAVE_STRTOD@/1/ +/^HAVE_STRTOLL *=/s/@HAVE_STRTOLL@/1/ +/^HAVE_STRTOULL *=/s/@HAVE_STRTOULL@/1/ +/^HAVE_STRUCT_RANDOM_DATA *=/s/@HAVE_STRUCT_RANDOM_DATA@/0/ +/^HAVE_SYMLINK *=/s/@HAVE_SYMLINK@/1/ +/^HAVE_SYMLINKAT *=/s/@HAVE_SYMLINKAT@/0/ +/^HAVE_SYS_LOADAVG_H *=/s/@HAVE_SYS_LOADAVG_H@/0/ +/^HAVE_SYS_PARAM_H *=/s/@HAVE_SYS_PARAM_H@/1/ +/^HAVE_TIMEGM *=/s/@HAVE_TIMEGM@/0/ +/^HAVE_UNISTD_H *=/s/@HAVE_UNISTD_H@/1/ +/^HAVE_UNLINKAT *=/s/@HAVE_UNLINKAT@/0/ +/^HAVE_UNLOCKPT *=/s/@HAVE_UNLOCKPT@/0/ +/^HAVE_USLEEP *=/s/@HAVE_USLEEP@/1/ +/^HAVE_WCHAR_T *=/s/@HAVE_WCHAR_T@/1/ +/^HAVE_XSERVER *=/s/@HAVE_XSERVER@/0/ +/^HAVE__BOOL *=/s/@HAVE__BOOL@/1/ +/^HAVE__EXIT *=/s/@HAVE__EXIT@/1/ +/^INCLUDE_NEXT *=/s/@INCLUDE_NEXT@/include_next/ +/^INCLUDE_NEXT_AS_FIRST_DIRECTIVE *=/s/@[^@\n]*@/include_next/ +/^LDFLAGS *=/s/@[^@\n]*@// +/^LD_FIRSTFLAG *=/s/@[^@\n]*@// +/^LIBS *=/s/@[^@\n]*@// +/^MAKEINFO *=/s/@MAKEINFO@/makeinfo/ +/^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@// +/^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@[^@\n]*@// +/^NEXT_AS_FIRST_DIRECTIVE_STDLIB_H *=/s/@[^@\n]*@// +/^NEXT_AS_FIRST_DIRECTIVE_TIME_H *=/s/@[^@\n]*@// +/^NEXT_AS_FIRST_DIRECTIVE_UNISTD_H *=/s/@[^@\n]*@// +/^NEXT_GETOPT_H *=/s/@[^@\n]*@// +/^NEXT_STDDEF_H *=/s/@[^@\n]*@// +/^NEXT_STDLIB_H *=/s/@[^@\n]*@// +/^NEXT_TIME_H *=/s/@[^@\n]*@// +/^NEXT_UNISTD_H *=/s/@[^@\n]*@// +/^OBJEXT *=/s/@[^@\n]*@/o/ +/^PRAGMA_COLUMNS *=/s/@[^@\n]*@// +/^PRAGMA_SYSTEM_HEADER *=/s/@[^@\n]*@/\\\#pragma GCC system_header/ +/^PTHREAD_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/ +/^RANLIB *=/s/@[^@\n]*@/ranlib/ +/^REPLACE_CALLOC *=/s/@REPLACE_CALLOC@/0/ +/^REPLACE_CANONICALIZE_FILE_NAME *=/s/@REPLACE_CANONICALIZE_FILE_NAME@/0/ +/^REPLACE_CHOWN *=/s/@REPLACE_CHOWN@/0/ +/^REPLACE_CLOSE *=/s/@REPLACE_CLOSE@/0/ +/^REPLACE_DUP *=/s/@REPLACE_DUP@/0/ +/^REPLACE_DUP2 *=/s/@REPLACE_DUP2@/0/ +/^REPLACE_FCHOWNAT *=/s/@REPLACE_FCHOWNAT@/0/ +/^REPLACE_GETCWD *=/s/@REPLACE_GETCWD@/0/ +/^REPLACE_GETDOMAINNAME *=/s/@REPLACE_GETDOMAINNAME@/0/ +/^REPLACE_GETGROUPS *=/s/@REPLACE_GETGROUPS@/0/ +/^REPLACE_GETLOGIN_R *=/s/@REPLACE_GETLOGIN_R@/0/ +/^REPLACE_GETPAGESIZE *=/s/@REPLACE_GETPAGESIZE@/0/ +/^REPLACE_LCHOWN *=/s/@REPLACE_LCHOWN@/0/ +/^REPLACE_LINK *=/s/@REPLACE_LINK@/0/ +/^REPLACE_LINKAT *=/s/@REPLACE_LINKAT@/0/ +/^REPLACE_LOCALTIME_R *=/s/@REPLACE_LOCALTIME_R@/0/ +/^REPLACE_LSEEK *=/s/@REPLACE_LSEEK@/0/ +/^REPLACE_MALLOC *=/s/@REPLACE_MALLOC@/0/ +/^REPLACE_MKSTEMP *=/s/@REPLACE_MKSTEMP@/0/ +/^REPLACE_MKTIME *=/s/@REPLACE_MKTIME@/0/ +/^REPLACE_NANOSLEEP *=/s/@REPLACE_NANOSLEEP@/0/ +/^REPLACE_NULL *=/s/@REPLACE_NULL@/0/ +/^REPLACE_PREAD *=/s/@REPLACE_PREAD@/0/ +/^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/ +/^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/ +/^REPLACE_READLINK *=/s/@REPLACE_READLINK@/0/ +/^REPLACE_REALLOC *=/s/@REPLACE_REALLOC@/0/ +/^REPLACE_REALPATH *=/s/@REPLACE_REALPATH@/0/ +/^REPLACE_RMDIR *=/s/@REPLACE_RMDIR@/0/ +/^REPLACE_SETENV *=/s/@REPLACE_SETENV@/0/ +/^REPLACE_SLEEP *=/s/@REPLACE_SLEEP@/0/ +/^REPLACE_STRTOD *=/s/@REPLACE_STRTOD@/0/ +/^REPLACE_SYMLINK *=/s/@REPLACE_SYMLINK@/0/ +/^REPLACE_TIMEGM *=/s/@REPLACE_TIMEGM@/0/ +/^REPLACE_TTYNAME_R *=/s/@REPLACE_TTYNAME_R@/0/ +/^REPLACE_UNLINK *=/s/@REPLACE_UNLINK@/0/ +/^REPLACE_UNLINKAT *=/s/@REPLACE_UNLINKAT@/0/ +/^REPLACE_UNSETENV *=/s/@REPLACE_UNSETENV@/0/ +/^REPLACE_USLEEP *=/s/@REPLACE_USLEEP@/0/ +/^REPLACE_WRITE *=/s/@REPLACE_WRITE@/0/ +/^STDBOOL_H *=/s/@[^@\n]*@// +/^STDDEF_H *=/s/@[^@\n]*@// +/^SYS_TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/ +/^TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/ +/^UNISTD_H_HAVE_WINSOCK2_H *=/s/@[^@\n]*@/0/ +/^UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS *=/s/@[^@\n]*@/0/ +/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o/ +/^srcdir *=/s/@[^@\n]*@/./ +/^top_srcdir *=/s/@[^@\n]*@/../ +/^top_builddir *=/s/@[^@\n]*@/../ +s/@PRAGMA_SYSTEM_HEADER@/\#pragma GCC system_header/ +s/@PRAGMA_COLUMNS@// +# +# Delete the recipes we don't want to get in our way. +/^\$(srcdir)\/Makefile\.in:/,/^[ ][ ]*\$(AUTOMAKE)/d +/^Makefile:/,/^[ ][ ]*esac/d +/^\$(top_srcdir)\/configure:/,/^\$(ACLOCAL_M4)/d +# +# Fix the include-dependency lines +s/^@AMDEP_TRUE@// +s/^@AMDEP_FALSE@/\#/ +s/@am__include@/include/ +s/@am__quote@//g +s/^@am__fastdepCC_TRUE@// +s/^@am__fastdepCC_FALSE/\#/ +# +# Fix the *-clean rules, to not use a Unixy `test' command. Empty +# lists are replaced with a dummy file, to avoid an error message from +# "rm -f" with no arguments. +/^CONFIG_CLEAN_FILES *= *$/c\ +CONFIG_CLEAN_FILES = xyzzy +/^CONFIG_CLEAN_VPATH_FILES *= *$/c\ +CONFIG_CLEAN_VPATH_FILES = xyzzy +s/^ -*test -z.*|| rm/ -rm/ +s/@echo /@djecho/ +# +# Fix the recipes for header files +/^arg-nonnull\.h:/,/^[ ][ ]*mv /c\ +arg-nonnull.h: $(top_srcdir)/./arg-nonnull.h\ + sed -n -e '/GL_ARG_NONNULL/,$$p' < $(top_srcdir)/./arg-nonnull.h > $@ +/^cxxdefs\.h:/,/^[ ][ ]*mv /c\ +cxxdefs.h: $(top_srcdir)/./cxxdefs.h\ + sed -n -e '/_GL_CXXDEFS/,$$p' < $(top_srcdir)/./cxxdefs.h > $@ +s/^ [ ]*{ echo \(.*\); \\/ djecho \1 > $@-t/ +s/^ [ ]*{ echo \(.*\) && \\/ djecho \1 > $@-t/ +s/ \&\& \\ *$// +s/\.in-h\; *\\$/.in-h >> $@-t/ +/^ [ ]*} /d +/^stdlib\.h:/,/^ [ ]*mv /{ + s/'\; \\ *$/' >> $@-t/ +} +/^unistd\.h:/,/^ [ ]*mv /{ + s/'\; \\ *$/' >> $@-t/ +} === modified file 'src/ChangeLog' --- src/ChangeLog 2011-02-19 19:40:59 +0000 +++ src/ChangeLog 2011-02-19 19:56:29 +0000 @@ -1,3 +1,9 @@ +2011-02-19 Eli Zaretskii + + * termcap.c (tputs): Don't declare baud_rate. + + * s/msdos.h (strtold): Define to _strtold. + 2011-02-18 Stefan Monnier * process.c (Fstart_process, Fmake_serial_process) === modified file 'src/s/msdos.h' --- src/s/msdos.h 2011-02-14 17:58:13 +0000 +++ src/s/msdos.h 2011-02-19 15:57:35 +0000 @@ -73,6 +73,15 @@ #define HAVE_INVERSE_HYPERBOLIC #define FLOAT_CHECK_DOMAIN +/* Start of gnulib-related stuff */ + +/* lib/ftoastr.c wants strtold, but DJGPP only has _strtold. DJGPP > + 2.03 has it, but it also has _strtold as a stub that jumps to + strtold, so use _strtold in all versions. */ +#define strtold _strtold + +/* End of gnulib-related stuff. */ + /* When $TERM is "internal" then this is substituted: */ #define INTERNAL_TERMINAL "pc|bios|IBM PC with color display:\ :co#80:li#25:Co#16:pa#256:km:ms:cm=:cl=:ce=:\ === modified file 'src/termcap.c' --- src/termcap.c 2011-01-17 19:01:01 +0000 +++ src/termcap.c 2011-02-19 19:41:00 +0000 @@ -268,7 +268,6 @@ register int padcount = 0; register int speed; - extern EMACS_INT baud_rate; speed = baud_rate; /* For quite high speeds, convert to the smaller units to avoid overflow. */ ------------------------------------------------------------ revno: 103351 [merge] committer: Glenn Morris branch nick: trunk timestamp: Sat 2011-02-19 11:40:59 -0800 message: Merge from emacs-23; up to r100491 diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-02-14 17:21:10 +0000 +++ doc/emacs/ChangeLog 2011-02-19 19:40:59 +0000 @@ -1,3 +1,7 @@ +2011-02-19 Glenn Morris + + * dired.texi (Dired): Dired-X version number was dropped. + 2011-02-14 Jan Djärv * xresources.texi (X Resources): Remove *faceName and replace it with === modified file 'doc/emacs/dired.texi' --- doc/emacs/dired.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/dired.texi 2011-02-19 19:40:59 +0000 @@ -23,7 +23,7 @@ them with one command. The Dired-X package provides various extra features for Dired mode. -@xref{Top, Dired-X,,dired-x, Dired Extra Version 2 User's Manual}. +@xref{Top, Dired-X,,dired-x, Dired Extra User's Manual}. You can also view a list of files in a directory with @kbd{C-x C-d} (@code{list-directory}). Unlike Dired, this command does not allow === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2011-01-25 04:08:28 +0000 +++ doc/lispintro/ChangeLog 2011-02-19 19:40:59 +0000 @@ -1,3 +1,7 @@ +2011-02-19 Eli Zaretskii + + * emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir. + 2011-01-23 Werner Lemberg * Makefile.in (MAKEINFO): Now controlled by `configure'. === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2011-01-25 04:08:28 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2011-02-19 19:40:59 +0000 @@ -216,7 +216,7 @@ @c ---------------------------------------------------- -@dircategory Emacs +@dircategory GNU Emacs Lisp @direntry * Emacs Lisp Intro: (eintr). A simple introduction to Emacs Lisp programming. === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-02-09 00:28:06 +0000 +++ doc/lispref/ChangeLog 2011-02-19 19:40:59 +0000 @@ -1,3 +1,23 @@ +2011-02-19 Eli Zaretskii + + * elisp.texi: Sync @dircategory with ../../info/dir. + + * files.texi (Visiting Functions): Document find-file-literally, + both the command and the variable. + + * variables.texi (Creating Buffer-Local): Explain the meaning of + permanent local variables. + + * files.texi (Visiting Functions): Document find-file-literally, + both the command and the variable. + + * variables.texi (Creating Buffer-Local): Explain the meaning of + permanent local variables. + +2011-02-19 Glenn Morris + + * keymaps.texi (Remapping Commands): Mention how to undo it. + 2011-02-09 Reuben Thomas * loading.texi (Hooks for Loading): Remove unnecessary advice === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2011-02-16 08:39:19 +0000 +++ doc/lispref/elisp.texi 2011-02-19 19:40:59 +0000 @@ -62,7 +62,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory GNU Emacs Lisp @direntry * Elisp: (elisp). The Emacs Lisp Reference Manual. @end direntry === modified file 'doc/lispref/files.texi' --- doc/lispref/files.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/files.texi 2011-02-19 19:40:59 +0000 @@ -113,6 +113,26 @@ @var{filename} in the minibuffer. @end deffn +@deffn Command find-file-literally filename +This command visits @var{filename}, like @code{find-file} does, but it +does not perform any format conversions (@pxref{Format Conversion}), +character code conversions (@pxref{Coding Systems}), or end-of-line +conversions (@pxref{Coding System Basics, End of line conversion}). +The buffer visiting the file is made unibyte, and its major mode is +Fundamental mode, regardless of the file name. File local variable +specifications in the file (@pxref{File Local Variables}) are +ignored, and automatic decompression and adding a newline at the end +of the file due to @code{require-final-newline} (@pxref{Saving +Buffers, require-final-newline}) are also disabled. + +Note that if Emacs already has a buffer visiting the same file +non-literally, it will not visit the same file literally, but instead +just switch to the existing buffer. If you want to be sure of +accessing a file's contents literally, you should create a temporary +buffer and then read the file contents into it using +@code{insert-file-contents-literally} (@pxref{Reading from Files}). +@end deffn + @defun find-file-noselect filename &optional nowarn rawfile wildcards This function is the guts of all the file-visiting functions. It returns a buffer visiting the file @var{filename}. You may make the @@ -224,6 +244,16 @@ used, and in many cases only some of the functions are called. @end defvar +@defvar find-file-literally +This buffer-local variable, if set to a non-@code{nil} value, makes +@code{save-buffer} behave as if the buffer were visiting its file +literally, i.e. without conversions of any kind. The command +@code{find-file-literally} sets this variable's local value, but other +equivalent functions and commands can do that as well, e.g.@: to avoid +automatic addition of a newline at the end of the file. This variable +us permanent local, so it is unaffected by changes of major modes. +@end defvar + @node Subroutines of Visiting @comment node-name, next, previous, up @subsection Subroutines of Visiting === modified file 'doc/lispref/keymaps.texi' --- doc/lispref/keymaps.texi 2011-01-31 23:54:50 +0000 +++ doc/lispref/keymaps.texi 2011-02-19 19:40:59 +0000 @@ -1508,6 +1508,12 @@ if an ordinary binding specifies @code{my-kill-line}, this keymap will remap it to @code{my-other-kill-line}. +To undo the remapping of a command, remap it to @code{nil}; e.g. + +@smallexample +(define-key my-mode-map [remap kill-line] nil) +@end smallexample + @defun command-remapping command &optional position keymaps This function returns the remapping for @var{command} (a symbol), given the current active keymaps. If @var{command} is not remapped === modified file 'doc/lispref/variables.texi' --- doc/lispref/variables.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/variables.texi 2011-02-19 19:40:59 +0000 @@ -1407,6 +1407,8 @@ @cindex permanent local variable A buffer-local variable is @dfn{permanent} if the variable name (a symbol) has a @code{permanent-local} property that is non-@code{nil}. +Such variables are unaffected by @code{kill-all-local-variables}, and +their local bindings are therefore not cleared by changing major modes. Permanent locals are appropriate for data pertaining to where the file came from or how to save it, rather than with how to edit the contents. === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-02-19 19:20:38 +0000 +++ doc/misc/ChangeLog 2011-02-19 19:40:59 +0000 @@ -1,3 +1,53 @@ +2011-02-19 Eli Zaretskii + + * ada-mode.texi: Sync @dircategory with ../../info/dir. + * auth.texi: Sync @dircategory with ../../info/dir. + * autotype.texi: Sync @dircategory with ../../info/dir. + * calc.texi: Sync @dircategory with ../../info/dir. + * cc-mode.texi: Sync @dircategory with ../../info/dir. + * cl.texi: Sync @dircategory with ../../info/dir. + * dbus.texi: Sync @dircategory with ../../info/dir. + * dired-x.texi: Sync @dircategory with ../../info/dir. + * ebrowse.texi: Sync @dircategory with ../../info/dir. + * ede.texi: Sync @dircategory with ../../info/dir. + * ediff.texi: Sync @dircategory with ../../info/dir. + * edt.texi: Sync @dircategory with ../../info/dir. + * eieio.texi: Sync @dircategory with ../../info/dir. + * emacs-mime.texi: Sync @dircategory with ../../info/dir. + * epa.texi: Sync @dircategory with ../../info/dir. + * erc.texi: Sync @dircategory with ../../info/dir. + * eshell.texi: Sync @dircategory with ../../info/dir. + * eudc.texi: Sync @dircategory with ../../info/dir. + * flymake.texi: Sync @dircategory with ../../info/dir. + * forms.texi: Sync @dircategory with ../../info/dir. + * gnus.texi: Sync @dircategory with ../../info/dir. + * idlwave.texi: Sync @dircategory with ../../info/dir. + * mairix-el.texi: Sync @dircategory with ../../info/dir. + * message.texi: Sync @dircategory with ../../info/dir. + * mh-e.texi: Sync @dircategory with ../../info/dir. + * newsticker.texi: Sync @dircategory with ../../info/dir. + * nxml-mode.texi: Sync @dircategory with ../../info/dir. + * org.texi: Sync @dircategory with ../../info/dir. + * pcl-cvs.texi: Sync @dircategory with ../../info/dir. + * pgg.texi: Sync @dircategory with ../../info/dir. + * rcirc.texi: Sync @dircategory with ../../info/dir. + * reftex.texi: Sync @dircategory with ../../info/dir. + * remember.texi: Sync @dircategory with ../../info/dir. + * sasl.texi: Sync @dircategory with ../../info/dir. + * sc.texi: Sync @dircategory with ../../info/dir. + * semantic.texi: Sync @dircategory with ../../info/dir. + * ses.texi: Sync @dircategory with ../../info/dir. + * sieve.texi: Sync @dircategory with ../../info/dir. + * smtpmail.texi: Sync @dircategory with ../../info/dir. + * speedbar.texi: Sync @dircategory with ../../info/dir. + * trampver.texi [emacs]: Set emacsname to "Emacs". + * tramp.texi: Sync @dircategory with ../../info/dir. + * url.texi: Sync @dircategory with ../../info/dir. + * vip.texi: Sync @dircategory with ../../info/dir. + * viper.texi: Sync @dircategory with ../../info/dir. + * widget.texi: Sync @dircategory with ../../info/dir. + * woman.texi: Sync @dircategory with ../../info/dir. + 2011-02-19 Glenn Morris * dired-x.texi (Technical Details): No longer redefines dired-add-entry, === modified file 'doc/misc/ada-mode.texi' --- doc/misc/ada-mode.texi 2011-02-13 02:21:30 +0000 +++ doc/misc/ada-mode.texi 2011-02-19 19:40:59 +0000 @@ -19,7 +19,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs editing modes @direntry * Ada mode: (ada-mode). Emacs mode for editing and compiling Ada code. @end direntry === modified file 'doc/misc/auth.texi' --- doc/misc/auth.texi 2011-02-17 23:46:18 +0000 +++ doc/misc/auth.texi 2011-02-19 19:40:59 +0000 @@ -32,7 +32,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * Auth-source: (auth). The Emacs auth-source library. @end direntry === modified file 'doc/misc/autotype.texi' --- doc/misc/autotype.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/autotype.texi 2011-02-19 19:40:59 +0000 @@ -26,7 +26,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Autotype: (autotype). Convenient features for text that you enter frequently in Emacs. === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2011-02-07 01:40:47 +0000 +++ doc/misc/calc.texi 2011-02-19 19:40:59 +0000 @@ -111,7 +111,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Calc: (calc). Advanced desk calculator and mathematical tool. @end direntry === modified file 'doc/misc/cc-mode.texi' --- doc/misc/cc-mode.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/cc-mode.texi 2011-02-19 19:40:59 +0000 @@ -177,7 +177,7 @@ @comment Info directory entry for use by install-info. The indentation @comment here is by request from the FSF folks. -@dircategory Emacs +@dircategory Emacs editing modes @direntry * CC Mode: (ccmode). Emacs mode for editing C, C++, Objective-C, Java, Pike, AWK, and CORBA IDL code. === modified file 'doc/misc/cl.texi' --- doc/misc/cl.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/cl.texi 2011-02-19 19:40:59 +0000 @@ -21,7 +21,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * CL: (cl). Partial Common Lisp support for Emacs Lisp. @end direntry === modified file 'doc/misc/dbus.texi' --- doc/misc/dbus.texi 2011-02-07 09:21:08 +0000 +++ doc/misc/dbus.texi 2011-02-19 19:40:59 +0000 @@ -25,7 +25,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * D-Bus: (dbus). Using D-Bus in Emacs. @end direntry === modified file 'doc/misc/dired-x.texi' --- doc/misc/dired-x.texi 2011-02-19 19:20:38 +0000 +++ doc/misc/dired-x.texi 2011-02-19 19:40:59 +0000 @@ -36,7 +36,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Dired-X: (dired-x). Dired Extra Features. @end direntry === modified file 'doc/misc/ebrowse.texi' --- doc/misc/ebrowse.texi 2011-02-13 02:21:30 +0000 +++ doc/misc/ebrowse.texi 2011-02-19 19:40:59 +0000 @@ -26,7 +26,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Ebrowse: (ebrowse). A C++ class browser for Emacs. @end direntry === modified file 'doc/misc/ede.texi' --- doc/misc/ede.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/ede.texi 2011-02-19 19:40:59 +0000 @@ -21,9 +21,9 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry -* ede: (ede). Project management for Emacs. +* EDE: (ede). The Emacs Development Environment. @end direntry @titlepage === modified file 'doc/misc/ediff.texi' --- doc/misc/ediff.texi 2011-02-13 02:21:30 +0000 +++ doc/misc/ediff.texi 2011-02-19 19:40:59 +0000 @@ -41,7 +41,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Ediff: (ediff). A visual interface for comparing and merging programs. @end direntry === modified file 'doc/misc/edt.texi' --- doc/misc/edt.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/edt.texi 2011-02-19 19:40:59 +0000 @@ -22,7 +22,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * EDT: (edt). An Emacs emulation of the EDT editor. @end direntry === modified file 'doc/misc/eieio.texi' --- doc/misc/eieio.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/eieio.texi 2011-02-19 19:40:59 +0000 @@ -27,9 +27,9 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry -* eieio: (eieio). Objects for Emacs. +* EIEIO: (eieio). An objects system for Emacs Lisp. @end direntry @titlepage === modified file 'doc/misc/emacs-mime.texi' --- doc/misc/emacs-mime.texi 2011-02-06 00:25:41 +0000 +++ doc/misc/emacs-mime.texi 2011-02-19 19:40:59 +0000 @@ -30,7 +30,7 @@ @c Node ``Interface Functions'' uses Latin-1 characters @documentencoding ISO-8859-1 -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * Emacs MIME: (emacs-mime). Emacs MIME de/composition library. @end direntry === modified file 'doc/misc/epa.texi' --- doc/misc/epa.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/epa.texi 2011-02-19 19:40:59 +0000 @@ -31,7 +31,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * EasyPG Assistant: (epa). An Emacs user interface to GNU Privacy Guard. @end direntry === modified file 'doc/misc/erc.texi' --- doc/misc/erc.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/erc.texi 2011-02-19 19:40:59 +0000 @@ -28,7 +28,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * ERC: (erc). Powerful and extensible IRC client for Emacs. @end direntry === modified file 'doc/misc/eshell.texi' --- doc/misc/eshell.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/eshell.texi 2011-02-19 19:40:59 +0000 @@ -24,7 +24,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Eshell: (eshell). A command shell implemented in Emacs Lisp. @end direntry === modified file 'doc/misc/eudc.texi' --- doc/misc/eudc.texi 2011-02-13 02:21:30 +0000 +++ doc/misc/eudc.texi 2011-02-19 19:40:59 +0000 @@ -28,7 +28,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * EUDC: (eudc). Emacs client for directory servers (LDAP, PH). @end direntry === modified file 'doc/misc/flymake.texi' --- doc/misc/flymake.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/flymake.texi 2011-02-19 19:40:59 +0000 @@ -28,7 +28,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Flymake: (flymake). A universal on-the-fly syntax checker. @end direntry === modified file 'doc/misc/forms.texi' --- doc/misc/forms.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/forms.texi 2011-02-19 19:40:59 +0000 @@ -34,7 +34,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Forms: (forms). Emacs package for editing data bases by filling in forms. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-02-06 00:25:41 +0000 +++ doc/misc/gnus.texi 2011-02-19 19:40:59 +0000 @@ -321,7 +321,7 @@ @end iflatex @end iftex -@dircategory Emacs +@dircategory Emacs network features @direntry * Gnus: (gnus). The newsreader Gnus. @end direntry === modified file 'doc/misc/idlwave.texi' --- doc/misc/idlwave.texi 2011-02-13 02:21:30 +0000 +++ doc/misc/idlwave.texi 2011-02-19 19:40:59 +0000 @@ -38,7 +38,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs editing modes @direntry * IDLWAVE: (idlwave). Major mode and shell for IDL files. @end direntry === modified file 'doc/misc/mairix-el.texi' --- doc/misc/mairix-el.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/mairix-el.texi 2011-02-19 19:40:59 +0000 @@ -22,7 +22,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Mairix: (mairix-el). Emacs interface to the Mairix mail indexer. @end direntry === modified file 'doc/misc/message.texi' --- doc/misc/message.texi 2011-02-06 00:25:41 +0000 +++ doc/misc/message.texi 2011-02-19 19:40:59 +0000 @@ -26,7 +26,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Message: (message). Mail and news composition mode that goes with Gnus. === modified file 'doc/misc/mh-e.texi' --- doc/misc/mh-e.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/mh-e.texi 2011-02-19 19:40:59 +0000 @@ -55,7 +55,7 @@ @end copying @c Info Directory Entry -@dircategory Emacs +@dircategory Emacs network features @direntry * MH-E: (mh-e). Emacs interface to the MH mail system. @end direntry === modified file 'doc/misc/newsticker.texi' --- doc/misc/newsticker.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/newsticker.texi 2011-02-19 19:40:59 +0000 @@ -30,7 +30,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Newsticker: (newsticker). A Newsticker for Emacs. @end direntry === modified file 'doc/misc/nxml-mode.texi' --- doc/misc/nxml-mode.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/nxml-mode.texi 2011-02-19 19:40:59 +0000 @@ -31,7 +31,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs editing modes @direntry * nXML Mode: (nxml-mode). XML editing mode with RELAX NG support. @end direntry === modified file 'doc/misc/org.texi' --- doc/misc/org.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/org.texi 2011-02-19 19:40:59 +0000 @@ -286,7 +286,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs editing modes @direntry * Org Mode: (org). Outline-based notes management and organizer @end direntry === modified file 'doc/misc/pcl-cvs.texi' --- doc/misc/pcl-cvs.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/pcl-cvs.texi 2011-02-19 19:40:59 +0000 @@ -23,7 +23,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * PCL-CVS: (pcl-cvs). Emacs front-end to CVS. @end direntry === modified file 'doc/misc/pgg.texi' --- doc/misc/pgg.texi 2011-02-06 00:25:41 +0000 +++ doc/misc/pgg.texi 2011-02-19 19:40:59 +0000 @@ -27,7 +27,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * PGG: (pgg). Emacs interface to various PGP implementations. @end direntry === modified file 'doc/misc/rcirc.texi' --- doc/misc/rcirc.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/rcirc.texi 2011-02-19 19:40:59 +0000 @@ -22,7 +22,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Rcirc: (rcirc). Internet Relay Chat (IRC) client. @end direntry === modified file 'doc/misc/reftex.texi' --- doc/misc/reftex.texi 2011-02-13 02:21:30 +0000 +++ doc/misc/reftex.texi 2011-02-19 19:40:59 +0000 @@ -43,7 +43,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * RefTeX: (reftex). Emacs support for LaTeX cross-references and citations. === modified file 'doc/misc/remember.texi' --- doc/misc/remember.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/remember.texi 2011-02-19 19:40:59 +0000 @@ -25,7 +25,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Remember: (remember). Simple information manager for Emacs. @end direntry === modified file 'doc/misc/sasl.texi' --- doc/misc/sasl.texi 2011-02-06 00:25:41 +0000 +++ doc/misc/sasl.texi 2011-02-19 19:40:59 +0000 @@ -33,7 +33,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * SASL: (sasl). The Emacs SASL library. @end direntry === modified file 'doc/misc/sc.texi' --- doc/misc/sc.texi 2011-02-13 02:21:30 +0000 +++ doc/misc/sc.texi 2011-02-19 19:40:59 +0000 @@ -32,7 +32,7 @@ @c @smallbook -@dircategory Emacs +@dircategory Emacs network features @direntry * SC: (sc). Supercite lets you cite parts of messages you're replying to, in flexible ways. === modified file 'doc/misc/semantic.texi' --- doc/misc/semantic.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/semantic.texi 2011-02-19 19:40:59 +0000 @@ -40,7 +40,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Semantic: (semantic). Source code parser library and utilities. @end direntry === modified file 'doc/misc/ses.texi' --- doc/misc/ses.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/ses.texi 2011-02-19 19:40:59 +0000 @@ -27,7 +27,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * SES: (ses). Simple Emacs Spreadsheet. @end direntry === modified file 'doc/misc/sieve.texi' --- doc/misc/sieve.texi 2011-02-06 00:25:41 +0000 +++ doc/misc/sieve.texi 2011-02-19 19:40:59 +0000 @@ -27,7 +27,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Sieve: (sieve). Managing Sieve scripts in Emacs. @end direntry === modified file 'doc/misc/smtpmail.texi' --- doc/misc/smtpmail.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/smtpmail.texi 2011-02-19 19:40:59 +0000 @@ -20,7 +20,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * SMTP: (smtpmail). Emacs library for sending mail via SMTP. @end direntry === modified file 'doc/misc/speedbar.texi' --- doc/misc/speedbar.texi 2011-02-13 02:21:30 +0000 +++ doc/misc/speedbar.texi 2011-02-19 19:40:59 +0000 @@ -20,7 +20,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Speedbar: (speedbar). File/Tag summarizing utility. @end direntry === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2011-02-13 12:21:04 +0000 +++ doc/misc/tramp.texi 2011-02-19 19:40:59 +0000 @@ -54,7 +54,7 @@ @end copying @c Entries for @command{install-info} to use -@dircategory @value{emacsname} +@dircategory @value{emacsname} network features @direntry * TRAMP: (tramp). Transparent Remote Access, Multiple Protocol @value{emacsname} remote file access via rsh and rcp. === modified file 'doc/misc/trampver.texi' --- doc/misc/trampver.texi 2011-02-13 12:21:04 +0000 +++ doc/misc/trampver.texi 2011-02-19 19:40:59 +0000 @@ -38,7 +38,7 @@ @c Emacs values. @ifset emacs -@set emacsname GNU Emacs +@set emacsname Emacs @set emacsdir emacs @set ftppackagename Ange-FTP @set prefix / === modified file 'doc/misc/url.texi' --- doc/misc/url.texi 2011-02-12 23:40:43 +0000 +++ doc/misc/url.texi 2011-02-19 19:40:59 +0000 @@ -12,7 +12,7 @@ \overfullrule=0pt %\global\baselineskip 30pt % for printing in double space @end tex -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * URL: (url). URL loading package. @end direntry === modified file 'doc/misc/vip.texi' --- doc/misc/vip.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/vip.texi 2011-02-19 19:40:59 +0000 @@ -35,7 +35,7 @@ @finalout @contents -@dircategory Emacs +@dircategory Emacs misc features @direntry * VIP: (vip). An older VI-emulation for Emacs. @end direntry === modified file 'doc/misc/viper.texi' --- doc/misc/viper.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/viper.texi 2011-02-19 19:40:59 +0000 @@ -23,7 +23,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * VIPER: (viper). The newest Emacs VI-emulation mode. (also, A VI Plan for Emacs Rescue === modified file 'doc/misc/widget.texi' --- doc/misc/widget.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/widget.texi 2011-02-19 19:40:59 +0000 @@ -24,7 +24,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * Widget: (widget). The "widget" package used by the Emacs Customization facility. === modified file 'doc/misc/woman.texi' --- doc/misc/woman.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/woman.texi 2011-02-19 19:40:59 +0000 @@ -34,7 +34,7 @@ @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * WoMan: (woman). Browse UN*X Manual Pages "W.O. (without) Man". @end direntry === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-19 19:20:38 +0000 +++ lisp/ChangeLog 2011-02-19 19:40:59 +0000 @@ -1,3 +1,25 @@ +2011-02-19 Kenichi Handa + + * mail/rmailmm.el (rmail-mime-find-header-encoding): Be sure to + get the header copy into the temporary buffer. + (rmail-mime-insert-decoded-text): Ignore us-ascii. + (rmail-show-mime): When rmail-mime-coding-system is nil, set + buffer-file-coding-system to undecided. + +2011-02-19 Eli Zaretskii + + * international/mule-cmds.el (read-char-by-name, ucs-insert): + Document completion with asterisk and a substring. + +2011-02-19 Glenn Morris + + * files.el (find-file-literally): Doc fix. + + * simple.el (rfc822-goto-eoh): Give it a doc-string. + + * log-edit.el (log-edit-insert-changelog): + Fix `log-edit-strip-single-file-name' functionality. (Bug#8057) + 2011-02-19 Glenn Morris * dired-x.el (dired-read-shell-command): Merge into dired-aux's version. === modified file 'lisp/files.el' --- lisp/files.el 2011-02-18 17:18:16 +0000 +++ lisp/files.el 2011-02-19 19:40:59 +0000 @@ -2072,7 +2072,8 @@ (defvar find-file-literally nil "Non-nil if this buffer was made by `find-file-literally' or equivalent. -This is a permanent local.") +This has the `permanent-local' property, which takes effect if you +make the variable buffer-local.") (put 'find-file-literally 'permanent-local t) (defun find-file-literally (filename) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-02-19 09:45:07 +0000 +++ lisp/gnus/ChangeLog 2011-02-19 19:40:59 +0000 @@ -1,3 +1,12 @@ +2011-02-19 Glenn Morris + + * gnus.el (gnus-meta): Doc fix. + +2011-02-19 Chong Yidong + + * nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update, + in case it's not yet loaded. + 2011-02-19 Lars Ingebrigtsen * nnimap.el (nnimap-parse-copied-articles): Allow for " OK" === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2011-02-03 23:43:22 +0000 +++ lisp/gnus/gnus.el 2011-02-19 19:40:59 +0000 @@ -275,7 +275,7 @@ (defgroup gnus-meta nil "Meta variables controlling major portions of Gnus. -In general, modifying these variables does not take affect until Gnus +In general, modifying these variables does not take effect until Gnus is restarted, and sometimes reloaded." :group 'gnus) === modified file 'lisp/gnus/nnfolder.el' --- lisp/gnus/nnfolder.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/nnfolder.el 2011-02-19 19:40:59 +0000 @@ -1090,8 +1090,8 @@ (gnus-make-directory (file-name-directory (buffer-file-name))) (let ((coding-system-for-write (or nnfolder-file-coding-system-for-write - nnfolder-file-coding-system)) - (copyright-update nil)) + nnfolder-file-coding-system))) + (set (make-local-variable 'copyright-update) nil) (save-buffer))) (unless (or gnus-nov-is-evil nnfolder-nov-is-evil) (nnfolder-save-nov))) === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2011-01-25 04:08:28 +0000 +++ lisp/international/mule-cmds.el 2011-02-19 19:40:59 +0000 @@ -2938,11 +2938,19 @@ (defun read-char-by-name (prompt) "Read a character by its Unicode name or hex number string. Display PROMPT and read a string that represents a character by its -Unicode property `name' or `old-name'. You can type a few of first -letters of the Unicode name and use completion. This function also -accepts a hexadecimal number of Unicode code point or a number in -hash notation, e.g. #o21430 for octal, #x2318 for hex, or #10r8984 -for decimal. Returns a character as a number." +Unicode property `name' or `old-name'. + +This function returns the character as a number. + +You can type a few of the first letters of the Unicode name and +use completion. If you type a substring of the Unicode name +preceded by an asterisk `*' and use completion, it will show all +the characters whose names include that substring, not necessarily +at the beginning of the name. + +This function also accepts a hexadecimal number of Unicode code +point or a number in hash notation, e.g. #o21430 for octal, +#x2318 for hex, or #10r8984 for decimal." (let* ((completion-ignore-case t) (input (completing-read prompt ucs-completions))) (cond @@ -2957,6 +2965,13 @@ "Insert COUNT copies of CHARACTER of the given Unicode code point. Interactively, prompts for a Unicode character name or a hex number using `read-char-by-name'. + +You can type a few of the first letters of the Unicode name and +use completion. If you type a substring of the Unicode name +preceded by an asterisk `*' and use completion, it will show all +the characters whose names include that substring, not necessarily +at the beginning of the name. + The optional third arg INHERIT (non-nil when called interactively), says to inherit text properties from adjoining text, if those properties are sticky." === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-02-12 21:45:42 +0000 +++ lisp/mail/rmail.el 2011-02-19 19:40:59 +0000 @@ -4306,7 +4306,7 @@ ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "3e235bdf4c2e54da06abcdd72e7f7649") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "9c0902449733cabd5c7e7d17092a7c69") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ === modified file 'lisp/mail/rmailmm.el' --- lisp/mail/rmailmm.el 2011-01-25 04:08:28 +0000 +++ lisp/mail/rmailmm.el 2011-02-19 19:40:59 +0000 @@ -472,10 +472,11 @@ HEADER is a header component of a MIME-entity object (see `rmail-mime-entity')." (with-temp-buffer - (let ((last-coding-system-used nil)) + (let ((buf (current-buffer))) (with-current-buffer rmail-mime-mbox-buffer - (let ((rmail-buffer rmail-mime-mbox-buffer) - (rmail-view-buffer rmail-mime-view-buffer)) + (let ((last-coding-system-used nil) + (rmail-buffer rmail-mime-mbox-buffer) + (rmail-view-buffer buf)) (save-excursion (goto-char (aref header 0)) (rmail-copy-headers (point) (aref header 1))))) @@ -514,7 +515,9 @@ ((string= transfer-encoding "quoted-printable") (quoted-printable-decode-region pos (point)))))) (decode-coding-region pos (point) coding-system) - (if (or (not rmail-mime-coding-system) (consp rmail-mime-coding-system)) + (if (and + (or (not rmail-mime-coding-system) (consp rmail-mime-coding-system)) + (not (eq (coding-system-base coding-system) 'us-ascii))) (setq rmail-mime-coding-system coding-system)) (or (bolp) (insert "\n")))) @@ -1302,7 +1305,10 @@ (rmail-mime-find-header-encoding (rmail-mime-entity-header entity))))) (set-buffer-file-coding-system - (coding-system-base rmail-mime-coding-system) t t)) + (if rmail-mime-coding-system + (coding-system-base rmail-mime-coding-system) + 'undecided) + t t)) ;; Decoding failed. ENTITY is an error message. Insert the ;; original message body as is, and show warning. (let ((region (with-current-buffer rmail-mime-mbox-buffer === modified file 'lisp/simple.el' --- lisp/simple.el 2011-02-16 21:06:23 +0000 +++ lisp/simple.el 2011-02-19 19:40:59 +0000 @@ -5723,7 +5723,10 @@ :group 'mail) (defun rfc822-goto-eoh () - ;; Go to header delimiter line in a mail message, following RFC822 rules + "If the buffer starts with a mail header, move point to the header's end. +Otherwise, moves to `point-min'. +The end of the header is the start of the next line, if there is one, +else the end of the last line. This function obeys RFC822." (goto-char (point-min)) (when (re-search-forward "^\\([:\n]\\|[^: \t\n]+[ \t\n]\\)" nil 'move) === modified file 'lisp/vc/log-edit.el' --- lisp/vc/log-edit.el 2011-01-25 04:08:28 +0000 +++ lisp/vc/log-edit.el 2011-02-19 19:40:59 +0000 @@ -621,14 +621,18 @@ (delete-region start end) (rfc822-goto-eoh) (insert "Fixes: " fixes "\n" (if (looking-at "\n") "" "\n"))))) - (goto-char (point-min)) - (when (and log-edit-strip-single-file-name (looking-at "\\*\\s-+")) - (forward-line 1) - (when (not (re-search-forward "^\\*\\s-+" nil t)) - (goto-char (point-min)) - (skip-chars-forward "^():") - (skip-chars-forward ": ") - (delete-region (point-min) (point)))))) + (and log-edit-strip-single-file-name + (progn (rfc822-goto-eoh) + (if (looking-at "\n") (forward-char 1)) + (looking-at "\\*\\s-+")) + (let ((start (point))) + (forward-line 1) + (when (not (re-search-forward "^\\*\\s-+" nil t)) + (goto-char start) + (skip-chars-forward "^():") + (skip-chars-forward ": ") + (delete-region start (point))))) + (goto-char (point-min)))) ;;;; ;;;; functions for getting commit message from ChangeLog a file... ------------------------------------------------------------ revno: 103350 committer: Glenn Morris branch nick: trunk timestamp: Sat 2011-02-19 11:20:38 -0800 message: Merge dired-x's dired-read-shell-command into dired-aux's version. * lisp/dired-x.el (dired-read-shell-command): Merge into dired-aux's version. * lisp/dired-aux.el (dired-read-shell-command): Merge dired-x's version. * doc/misc/dired-x.texi (Technical Details): No longer redefines dired-read-shell-command. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-02-19 18:55:15 +0000 +++ doc/misc/ChangeLog 2011-02-19 19:20:38 +0000 @@ -1,7 +1,8 @@ 2011-02-19 Glenn Morris * dired-x.texi (Technical Details): No longer redefines dired-add-entry, - dired-initial-position, or dired-clean-up-after-deletion. + dired-initial-position, dired-clean-up-after-deletion, or + dired-read-shell-command. 2011-02-18 Glenn Morris === modified file 'doc/misc/dired-x.texi' --- doc/misc/dired-x.texi 2011-02-19 18:55:15 +0000 +++ doc/misc/dired-x.texi 2011-02-19 19:20:38 +0000 @@ -177,15 +177,16 @@ @cindex Redefined functions @cindex @file{dired-aux.el} -When loaded this code @emph{redefines} some standard Dired functions. -From @file{dired.el}, the function @code{dired-find-buffer-nocreate}; -and from @file{dired-aux.el} the function @code{dired-read-shell-command}. -In addition, once @file{dired-x.el} is loaded, the following Dired -functions offer additional features. @code{dired-add-entry} obeys Dired -Omit mode (@pxref{Omitting Files in Dired}), if it is active. +When loaded this code @emph{redefines} the standard @file{dired.el} +function @code{dired-find-buffer-nocreate}. In addition, once +@file{dired-x.el} is loaded, the following Dired functions offer +additional features. @code{dired-add-entry} obeys Dired Omit mode +(@pxref{Omitting Files in Dired}), if it is active. @code{dired-initial-position} obeys @code{dired-find-subdir} (@pxref{Miscellaneous Commands}). @code{dired-clean-up-after-deletion} respects the value of @code{dired-clean-up-buffers-too}. +@code{dired-read-shell-command} uses @code{dired-guess-shell-command} +(@pxref{Shell Command Guessing}) to offer a smarter default command. @node Installation, Omitting Files in Dired, Introduction, Top @chapter Installation === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-19 18:55:15 +0000 +++ lisp/ChangeLog 2011-02-19 19:20:38 +0000 @@ -1,5 +1,8 @@ 2011-02-19 Glenn Morris + * dired-x.el (dired-read-shell-command): Merge into dired-aux's version. + * dired-aux.el (dired-read-shell-command): Merge dired-x's version. + * dired-x.el (dired-clean-up-after-deletion): Merge into dired.el. * dired.el (dired-clean-up-after-deletion): Merge dired-x's version. (dired-clean-up-buffers-too): Declare. === modified file 'lisp/dired-aux.el' --- lisp/dired-aux.el 2011-02-19 03:53:35 +0000 +++ lisp/dired-aux.el 2011-02-19 19:20:38 +0000 @@ -509,18 +509,22 @@ ;; This is an extra function so that you can redefine it, e.g., to use gmhist. (defun dired-read-shell-command (prompt arg files) - "Read a dired shell command prompting with PROMPT (using `read-shell-command'). -ARG is the prefix arg and may be used to indicate in the prompt which -FILES are affected." + "Read a dired shell command prompting with PROMPT. +Passes the prefix argument ARG to `dired-mark-prompt', so that it +can be used in the prompt to indicate which FILES are affected. +Normally reads the command with `read-shell-command', but if the +`dired-x' packages is loaded, uses `dired-guess-shell-command' to offer +a smarter default choice of shell command." (minibuffer-with-setup-hook (lambda () (set (make-local-variable 'minibuffer-default-add-function) 'minibuffer-default-add-dired-shell-commands)) - (dired-mark-pop-up - nil 'shell files - #'read-shell-command - (format prompt (dired-mark-prompt arg files)) - nil nil))) + (setq prompt (format prompt (dired-mark-prompt arg files))) + (if (featurep 'dired-x) + (dired-mark-pop-up nil 'shell files + #'dired-guess-shell-command prompt files) + (dired-mark-pop-up nil 'shell files + #'read-shell-command prompt nil nil)))) ;;;###autoload (defun dired-do-async-shell-command (command &optional arg file-list) === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-02-19 18:55:15 +0000 +++ lisp/dired-x.el 2011-02-19 19:20:38 +0000 @@ -47,9 +47,7 @@ ;; User customization: M-x customize-group RET dired-x RET. -;; When loaded this code redefines the following functions of GNU Emacs: -;; From dired.el: dired-find-buffer-nocreate. -;; From dired-aux.el: dired-read-shell-command. +;; When loaded this code redefines dired.el's dired-find-buffer-nocreate. ;; *Please* see the `dired-x' info pages for more details. @@ -804,10 +802,10 @@ ;; Brief Description: ;;; -;; `dired-do-shell-command' is bound to `!' by dired.el. +;; * `dired-do-shell-command' is bound to `!' by dired.el. ;;; -;; * Redefine `dired-read-shell-command' so it calls -;;; `dired-guess-shell-command'. +;; * `dired-guess-shell-command' provides smarter defaults for +;;; dired-aux.el's `dired-read-shell-command'. ;;; ;; * `dired-guess-shell-command' calls `dired-guess-default' with list of ;;; marked files. @@ -1094,23 +1092,6 @@ ;; If we got a return, then return default. (if (equal val "") default val)))) -;; REDEFINE. -;; Redefine dired-aux.el's version: -(defun dired-read-shell-command (prompt arg files) - "Read a dired shell command prompting with PROMPT (using `read-shell-command'). -ARG is the prefix arg and may be used to indicate in the prompt which -FILES are affected. -This is an extra function so that you can redefine it." - (minibuffer-with-setup-hook - (lambda () - (set (make-local-variable 'minibuffer-default-add-function) - 'minibuffer-default-add-dired-shell-commands)) - (dired-mark-pop-up - nil 'shell files - 'dired-guess-shell-command - (format prompt (dired-mark-prompt arg files)) ; PROMPT - files))) ; FILES - ;;; RELATIVE SYMBOLIC LINKS. ------------------------------------------------------------ revno: 103349 committer: Glenn Morris branch nick: trunk timestamp: Sat 2011-02-19 10:55:15 -0800 message: Merge dired-x's dired-clean-up-after-deletion into dired's version. * lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el. * lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version. (dired-clean-up-buffers-too): Declare. * doc/misc/dired-x.texi (Technical Details): No longer redefine dired-clean-up-after-deletion. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-02-19 04:12:23 +0000 +++ doc/misc/ChangeLog 2011-02-19 18:55:15 +0000 @@ -1,7 +1,7 @@ 2011-02-19 Glenn Morris * dired-x.texi (Technical Details): No longer redefines dired-add-entry, - or dired-initial-position. + dired-initial-position, or dired-clean-up-after-deletion. 2011-02-18 Glenn Morris === modified file 'doc/misc/dired-x.texi' --- doc/misc/dired-x.texi 2011-02-19 04:12:23 +0000 +++ doc/misc/dired-x.texi 2011-02-19 18:55:15 +0000 @@ -177,22 +177,15 @@ @cindex Redefined functions @cindex @file{dired-aux.el} -When loaded this code @emph{redefines} the following functions of GNU Emacs -from @file{dired.el} - -@itemize @bullet -@item -@code{dired-clean-up-after-deletion} -@item -@code{dired-find-buffer-nocreate} -@end itemize - -@noindent +When loaded this code @emph{redefines} some standard Dired functions. +From @file{dired.el}, the function @code{dired-find-buffer-nocreate}; and from @file{dired-aux.el} the function @code{dired-read-shell-command}. -In addition, once @file{dired.el} is loaded, @code{dired-add-entry} -obeys Dired Omit mode (@pxref{Omitting Files in Dired}), if it is active. -Similarly, @code{dired-initial-position} obeys @code{dired-find-subdir} -(@pxref{Miscellaneous Commands}). +In addition, once @file{dired-x.el} is loaded, the following Dired +functions offer additional features. @code{dired-add-entry} obeys Dired +Omit mode (@pxref{Omitting Files in Dired}), if it is active. +@code{dired-initial-position} obeys @code{dired-find-subdir} +(@pxref{Miscellaneous Commands}). @code{dired-clean-up-after-deletion} +respects the value of @code{dired-clean-up-buffers-too}. @node Installation, Omitting Files in Dired, Introduction, Top @chapter Installation === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-19 04:12:23 +0000 +++ lisp/ChangeLog 2011-02-19 18:55:15 +0000 @@ -1,5 +1,9 @@ 2011-02-19 Glenn Morris + * dired-x.el (dired-clean-up-after-deletion): Merge into dired.el. + * dired.el (dired-clean-up-after-deletion): Merge dired-x's version. + (dired-clean-up-buffers-too): Declare. + * dired-x.el (dired-initial-position): Merge into dired.el's version. * dired.el (dired-initial-position): Merge dired-x's version here. (dired-find-subdir): Declare. === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-02-19 04:12:23 +0000 +++ lisp/dired-x.el 2011-02-19 18:55:15 +0000 @@ -48,7 +48,7 @@ ;; User customization: M-x customize-group RET dired-x RET. ;; When loaded this code redefines the following functions of GNU Emacs: -;; From dired.el: dired-clean-up-after-deletion, dired-find-buffer-nocreate. +;; From dired.el: dired-find-buffer-nocreate. ;; From dired-aux.el: dired-read-shell-command. ;; *Please* see the `dired-x' info pages for more details. @@ -323,32 +323,6 @@ (dired-omit-startup)) -;;; BUFFER CLEANING. - -;; REDEFINE. -(defun dired-clean-up-after-deletion (fn) - "Clean up after a deleted file or directory FN. -Remove expanded subdir of deleted dir, if any." - (save-excursion (and (cdr dired-subdir-alist) - (dired-goto-subdir fn) - (dired-kill-subdir))) - ;; Offer to kill buffer of deleted file FN. - (when dired-clean-up-buffers-too - (let ((buf (get-file-buffer fn))) - (and buf - (funcall #'y-or-n-p - (format "Kill buffer of %s, too? " - (file-name-nondirectory fn))) - (kill-buffer buf))) - (let ((buf-list (dired-buffers-for-dir (expand-file-name fn)))) - (and buf-list - (y-or-n-p (format "Kill dired buffer%s of %s, too? " - (dired-plural-s (length buf-list)) - (file-name-nondirectory fn))) - (dolist (buf buf-list) - (kill-buffer buf)))))) - - ;;; EXTENSION MARKING FUNCTIONS. ;; Mark files with some extension. === modified file 'lisp/dired.el' --- lisp/dired.el 2011-02-19 09:35:15 +0000 +++ lisp/dired.el 2011-02-19 18:55:15 +0000 @@ -2749,12 +2749,32 @@ (save-excursion (forward-line 1) (point)))))) (dired-clean-up-after-deletion file)) -;; This is a separate function for the sake of dired-x.el. +(defvar dired-clean-up-buffers-too) + (defun dired-clean-up-after-deletion (fn) - ;; Clean up after a deleted file or directory FN. + "Clean up after a deleted file or directory FN. +Removes any expanded subdirectory of deleted directory. +If `dired-x' is loaded and `dired-clean-up-buffers-too' is non-nil, +also offers to kill buffers visiting deleted files and directories." (save-excursion (and (cdr dired-subdir-alist) (dired-goto-subdir fn) - (dired-kill-subdir)))) + (dired-kill-subdir))) + ;; Offer to kill buffer of deleted file FN. + (when (and (featurep 'dired-x) dired-clean-up-buffers-too) + (let ((buf (get-file-buffer fn))) + (and buf + (funcall #'y-or-n-p + (format "Kill buffer of %s, too? " + (file-name-nondirectory fn))) + (kill-buffer buf))) + (let ((buf-list (dired-buffers-for-dir (expand-file-name fn)))) + (and buf-list + (y-or-n-p (format "Kill dired buffer%s of %s, too? " + (dired-plural-s (length buf-list)) + (file-name-nondirectory fn))) + (dolist (buf buf-list) + (kill-buffer buf)))))) + ;; Confirmation ------------------------------------------------------------ revno: 103348 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Sat 2011-02-19 09:45:07 +0000 message: nnimap.el (nnimap-parse-copied-articles): Allow for " OK" outputs from the server. gnus-art.el (gnus-article-prepare): Run gnus-article-prepare-hook later so that bbdb can hook in easier. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-02-18 23:15:24 +0000 +++ lisp/gnus/ChangeLog 2011-02-19 09:45:07 +0000 @@ -1,3 +1,13 @@ +2011-02-19 Lars Ingebrigtsen + + * nnimap.el (nnimap-parse-copied-articles): Allow for " OK" + outputs from the server. + +2011-02-18 Antoine Levitt (tiny change) + + * gnus-art.el (gnus-article-prepare): Run gnus-article-prepare-hook + later so that bbdb can hook in easier. + 2011-02-18 Lars Ingebrigtsen * auth-source.el (auth-source-search): Don't try to create credentials === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-02-15 11:24:37 +0000 +++ lisp/gnus/gnus-art.el 2011-02-19 09:45:07 +0000 @@ -4637,6 +4637,7 @@ (forward-line -1)) (set-window-point (get-buffer-window (current-buffer)) (point)) (gnus-configure-windows 'article) + (gnus-run-hooks 'gnus-article-prepare-hook) t)))))) ;;;###autoload @@ -4654,8 +4655,7 @@ gnus-article-image-alist nil) (gnus-run-hooks 'gnus-tmp-internal-hook) (when gnus-display-mime-function - (funcall gnus-display-mime-function)) - (gnus-run-hooks 'gnus-article-prepare-hook))) + (funcall gnus-display-mime-function)))) ;;; ;;; Gnus Sticky Article Mode === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-02-18 00:41:50 +0000 +++ lisp/gnus/nnimap.el 2011-02-19 09:45:07 +0000 @@ -1823,7 +1823,7 @@ (defun nnimap-parse-copied-articles (sequences) (let (sequence copied range) (goto-char (point-min)) - (while (re-search-forward "^\\([0-9]+\\) OK " nil t) + (while (re-search-forward "^\\([0-9]+\\) OK\\b" nil t) (setq sequence (string-to-number (match-string 1))) (when (setq range (cadr (assq sequence sequences))) (push (gnus-uncompress-range range) copied))) ------------------------------------------------------------ revno: 103347 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2011-02-19 04:35:15 -0500 message: dired.el: Update autoloads. diff: === modified file 'lisp/dired.el' --- lisp/dired.el 2011-02-19 04:12:23 +0000 +++ lisp/dired.el 2011-02-19 09:35:15 +0000 @@ -3574,7 +3574,7 @@ ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "e66465bcd1687d66cfb1202c9963d567") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "281daa2642afe5c52ba09a29ea17dbd7") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ @@ -4033,7 +4033,7 @@ ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el" -;;;;;; "a2af6147cf06b53166d9e1a3bb200675") +;;;;;; "9e412288898d065e4ae92d106e0426c0") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ ------------------------------------------------------------ revno: 103346 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-02-18 20:12:23 -0800 message: Merge dired-x's redefinition of dired-initial-position into the main version. * lisp/dired-x.el (dired-initial-position): Merge into dired.el's version. * lisp/dired.el (dired-initial-position): Merge dired-x's version here. (dired-find-subdir): Declare. * doc/misc/dired-x.texi (Technical Details): No longer redefines dired-initial-position. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-02-19 03:53:35 +0000 +++ doc/misc/ChangeLog 2011-02-19 04:12:23 +0000 @@ -1,6 +1,7 @@ 2011-02-19 Glenn Morris - * dired-x.texi (Technical Details): No longer redefines dired-add-entry. + * dired-x.texi (Technical Details): No longer redefines dired-add-entry, + or dired-initial-position. 2011-02-18 Glenn Morris === modified file 'doc/misc/dired-x.texi' --- doc/misc/dired-x.texi 2011-02-19 03:53:35 +0000 +++ doc/misc/dired-x.texi 2011-02-19 04:12:23 +0000 @@ -185,14 +185,14 @@ @code{dired-clean-up-after-deletion} @item @code{dired-find-buffer-nocreate} -@item -@code{dired-initial-position} @end itemize @noindent and from @file{dired-aux.el} the function @code{dired-read-shell-command}. In addition, once @file{dired.el} is loaded, @code{dired-add-entry} obeys Dired Omit mode (@pxref{Omitting Files in Dired}), if it is active. +Similarly, @code{dired-initial-position} obeys @code{dired-find-subdir} +(@pxref{Miscellaneous Commands}). @node Installation, Omitting Files in Dired, Introduction, Top @chapter Installation === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-19 03:53:35 +0000 +++ lisp/ChangeLog 2011-02-19 04:12:23 +0000 @@ -1,5 +1,9 @@ 2011-02-19 Glenn Morris + * dired-x.el (dired-initial-position): Merge into dired.el's version. + * dired.el (dired-initial-position): Merge dired-x's version here. + (dired-find-subdir): Declare. + * dired-x.el (dired-omit-new-add-entry): Merge into dired-add-entry. * dired-aux.el (dired-add-entry): Give it a doc-string. Merge dired-x's dired-omit handling here. === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-02-19 03:53:35 +0000 +++ lisp/dired-x.el 2011-02-19 04:12:23 +0000 @@ -48,8 +48,7 @@ ;; User customization: M-x customize-group RET dired-x RET. ;; When loaded this code redefines the following functions of GNU Emacs: -;; From dired.el: dired-clean-up-after-deletion, dired-find-buffer-nocreate, -;; and dired-initial-position. +;; From dired.el: dired-clean-up-after-deletion, dired-find-buffer-nocreate. ;; From dired-aux.el: dired-read-shell-command. ;; *Please* see the `dired-x' info pages for more details. @@ -1408,16 +1407,6 @@ ;; (setq dired-buffers (delq elt dired-buffers))))) ;; result)) -;; REDEFINE. -;; Redefines dired.el's version of `dired-initial-position' -(defun dired-initial-position (dirname) - "Where point should go in a new listing of DIRNAME. -Point assumed at beginning of new subdir line. -You may redefine this function as you wish, e.g. like in `dired-x.el'." - (end-of-line) - (if dired-find-subdir (dired-goto-subdir dirname)) ; new - (if dired-trivial-filenames (dired-goto-next-nontrivial-file))) - ;; Does anyone use this? - lrd 6/29/93. ;; Apparently people do use it. - lrd 12/22/97. === modified file 'lisp/dired.el' --- lisp/dired.el 2011-02-17 22:57:38 +0000 +++ lisp/dired.el 2011-02-19 04:12:23 +0000 @@ -2544,11 +2544,15 @@ ;; return value of point (i.e., FOUND): (goto-char found)))) +(defvar dired-find-subdir) + +;; FIXME document whatever dired-x is doing. (defun dired-initial-position (dirname) - ;; Where point should go in a new listing of DIRNAME. - ;; Point assumed at beginning of new subdir line. - ;; You may redefine this function as you wish, e.g. like in dired-x.el. + "Where point should go in a new listing of DIRNAME. +Point assumed at beginning of new subdir line." (end-of-line) + (and (featurep 'dired-x) dired-find-subdir + (dired-goto-subdir dirname)) (if dired-trivial-filenames (dired-goto-next-nontrivial-file))) ;; These are hooks which make tree dired work. ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.