Now on revision 108213. ------------------------------------------------------------ revno: 108213 committer: Stefan Monnier branch nick: trunk timestamp: Sat 2012-05-12 23:05:06 -0400 message: Move define-obsolete-variable-alias before the var's definition. * lisp/vc/log-edit.el (vc-comment-ring, vc-comment-ring-index): * lisp/tooltip.el (tooltip-hook): * lisp/textmodes/reftex-toc.el (reftex-toc-map): * lisp/textmodes/reftex-sel.el (reftex-select-label-map) (reftex-select-bib-map): * lisp/textmodes/reftex-index.el (reftex-index-map) (reftex-index-phrases-map): * lisp/speedbar.el (speedbar-syntax-table, speedbar-key-map): * lisp/progmodes/meta-mode.el (meta-mode-map): * lisp/novice.el (disabled-command-hook): * lisp/loadhist.el (unload-hook-features-list): * lisp/frame.el (blink-cursor): * lisp/files.el (find-file-not-found-hooks, write-file-hooks) (write-contents-hooks): * lisp/emulation/tpu-edt.el (GOLD-map): * lisp/emacs-lock.el (emacs-lock-from-exiting): * lisp/emacs-lisp/generic.el (generic-font-lock-defaults): * lisp/emacs-lisp/chart.el (chart-map): * lisp/dos-fns.el (register-name-alist): * lisp/dired-x.el (dired-omit-files-p): * lisp/desktop.el (desktop-enable): * lisp/cus-edit.el (custom-mode-hook): * lisp/buff-menu.el (buffer-menu-mode-hook): * lisp/bookmark.el (bookmark-read-annotation-text-func) (bookmark-exit-hooks): * lisp/allout.el (allout-mode-deactivate-hook) (allout-exposure-change-hook, allout-structure-added-hook) (allout-structure-deleted-hook, allout-structure-shifted-hook): * lisp/dirtrack.el (dirtrack-toggle, dirtrackp, dirtrack-debug-toggle) (dirtrack-debug): Move call to define-obsolete-variable-alias so it comes before the corresponding variable's definition. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-05-12 15:04:11 +0000 +++ lisp/ChangeLog 2012-05-13 03:05:06 +0000 @@ -1,3 +1,38 @@ +2012-05-13 Stefan Monnier + + Move define-obsolete-variable-alias before the var's definition. + * vc/log-edit.el (vc-comment-ring, vc-comment-ring-index): + * tooltip.el (tooltip-hook): + * textmodes/reftex-toc.el (reftex-toc-map): + * textmodes/reftex-sel.el (reftex-select-label-map) + (reftex-select-bib-map): + * textmodes/reftex-index.el (reftex-index-map) + (reftex-index-phrases-map): + * speedbar.el (speedbar-syntax-table, speedbar-key-map): + * progmodes/meta-mode.el (meta-mode-map): + * novice.el (disabled-command-hook): + * loadhist.el (unload-hook-features-list): + * frame.el (blink-cursor): + * files.el (find-file-not-found-hooks, write-file-hooks) + (write-contents-hooks): + * emulation/tpu-edt.el (GOLD-map): + * emacs-lock.el (emacs-lock-from-exiting): + * emacs-lisp/generic.el (generic-font-lock-defaults): + * emacs-lisp/chart.el (chart-map): + * dos-fns.el (register-name-alist): + * dired-x.el (dired-omit-files-p): + * desktop.el (desktop-enable): + * cus-edit.el (custom-mode-hook): + * buff-menu.el (buffer-menu-mode-hook): + * bookmark.el (bookmark-read-annotation-text-func) + (bookmark-exit-hooks): + * allout.el (allout-mode-deactivate-hook) + (allout-exposure-change-hook, allout-structure-added-hook) + (allout-structure-deleted-hook, allout-structure-shifted-hook): + * dirtrack.el (dirtrack-toggle, dirtrackp, dirtrack-debug-toggle) + (dirtrack-debug): Move call to define-obsolete-variable-alias so it + comes before the corresponding variable's definition. + 2012-05-12 Chong Yidong * buff-menu.el (Buffer-menu-buffer+size-width): Doc fix (Bug#11454). === modified file 'lisp/allout.el' --- lisp/allout.el 2012-05-02 10:57:03 +0000 +++ lisp/allout.el 2012-05-13 03:05:06 +0000 @@ -1405,15 +1405,17 @@ (defvar allout-mode-hook nil "Hook run when allout mode starts.") ;;;_ = allout-mode-deactivate-hook +(define-obsolete-variable-alias 'allout-mode-deactivate-hook + 'allout-mode-off-hook "24.1") (defvar allout-mode-deactivate-hook nil "Hook run when allout mode ends.") -(define-obsolete-variable-alias 'allout-mode-deactivate-hook - 'allout-mode-off-hook "24.1") ;;;_ = allout-exposure-category (defvar allout-exposure-category nil "Symbol for use as allout invisible-text overlay category.") ;;;_ = allout-exposure-change-functions +(define-obsolete-variable-alias 'allout-exposure-change-hook + 'allout-exposure-change-functions "24.2") (defcustom allout-exposure-change-functions nil "Abnormal hook run after allout outline subtree exposure changes. It is run at the conclusion of `allout-flag-region'. @@ -1429,10 +1431,9 @@ :group 'allout :version "24.2") -(define-obsolete-variable-alias 'allout-exposure-change-hook - 'allout-exposure-change-functions "24.2") - ;;;_ = allout-structure-added-functions +(define-obsolete-variable-alias 'allout-structure-added-hook + 'allout-structure-added-functions "24.2") (defcustom allout-structure-added-functions nil "Abnormal hook run after adding items to an Allout outline. Functions on the hook should take two arguments: @@ -1445,10 +1446,9 @@ :group 'allout :version "24.2") -(define-obsolete-variable-alias 'allout-structure-added-hook - 'allout-structure-added-functions "24.2") - ;;;_ = allout-structure-deleted-functions +(define-obsolete-variable-alias 'allout-structure-deleted-hook + 'allout-structure-deleted-functions "24.2") (defcustom allout-structure-deleted-functions nil "Abnormal hook run after deleting subtrees from an Allout outline. Functions on the hook must take two arguments: @@ -1464,10 +1464,9 @@ :group 'allout :version "24.2") -(define-obsolete-variable-alias 'allout-structure-deleted-hook - 'allout-structure-deleted-functions "24.2") - ;;;_ = allout-structure-shifted-functions +(define-obsolete-variable-alias 'allout-structure-shifted-hook + 'allout-structure-shifted-functions "24.2") (defcustom allout-structure-shifted-functions nil "Abnormal hook run after shifting items in an Allout outline. Functions on the hook should take two arguments: @@ -1483,9 +1482,6 @@ :group 'allout :version "24.2") -(define-obsolete-variable-alias 'allout-structure-shifted-hook - 'allout-structure-shifted-functions "24.2") - ;;;_ = allout-after-copy-or-kill-hook (defcustom allout-after-copy-or-kill-hook nil "Normal hook run after copying outline text.." === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2012-02-28 08:17:21 +0000 +++ lisp/bookmark.el 2012-05-13 03:05:06 +0000 @@ -828,11 +828,11 @@ "# Date: " (current-time-string) "\n")) +(define-obsolete-variable-alias 'bookmark-read-annotation-text-func + 'bookmark-edit-annotation-text-func "23.1") (defvar bookmark-edit-annotation-text-func 'bookmark-default-annotation-text "Function to return default text to use for a bookmark annotation. It takes one argument, the name of the bookmark, as a string.") -(define-obsolete-variable-alias 'bookmark-read-annotation-text-func - 'bookmark-edit-annotation-text-func "23.1") (defvar bookmark-edit-annotation-mode-map (let ((map (make-sparse-keymap))) @@ -2164,11 +2164,11 @@ "Hook run at the end of loading library `bookmark.el'.") ;; Exit Hook, called from kill-emacs-hook +(define-obsolete-variable-alias 'bookmark-exit-hooks + 'bookmark-exit-hook "22.1") (defvar bookmark-exit-hook nil "Hook run when Emacs exits.") -(define-obsolete-variable-alias 'bookmark-exit-hooks 'bookmark-exit-hook "22.1") - (defun bookmark-exit-hook-internal () "Save bookmark state, if necessary, at Emacs exit time. This also runs `bookmark-exit-hook'." === modified file 'lisp/buff-menu.el' --- lisp/buff-menu.el 2012-05-12 15:04:11 +0000 +++ lisp/buff-menu.el 2012-05-13 03:05:06 +0000 @@ -199,6 +199,9 @@ map) "Local keymap for `Buffer-menu-mode' buffers.") +(define-obsolete-variable-alias 'buffer-menu-mode-hook + 'Buffer-menu-mode-hook "23.1") + (define-derived-mode Buffer-menu-mode tabulated-list-mode "Buffer Menu" "Major mode for Buffer Menu buffers. The Buffer Menu is invoked by the commands \\[list-buffers], \\[buffer-menu], and @@ -207,9 +210,6 @@ (lambda (&optional _noconfirm) 'fast)) (add-hook 'tabulated-list-revert-hook 'list-buffers--refresh nil t)) -(define-obsolete-variable-alias 'buffer-menu-mode-hook - 'Buffer-menu-mode-hook "23.1") - (defun buffer-menu (&optional arg) "Switch to the Buffer Menu. By default, all buffers are listed except those whose names start === modified file 'lisp/cus-edit.el' --- lisp/cus-edit.el 2012-05-04 23:16:47 +0000 +++ lisp/cus-edit.el 2012-05-13 03:05:06 +0000 @@ -4825,6 +4825,7 @@ (set (make-local-variable 'widget-link-suffix) "")) (setq show-trailing-whitespace nil)) +(define-obsolete-variable-alias 'custom-mode-hook 'Custom-mode-hook "23.1") (define-derived-mode Custom-mode nil "Custom" "Major mode for editing customization buffers. @@ -4873,7 +4874,6 @@ (Custom-mode)) (make-obsolete 'custom-mode 'Custom-mode "23.1") (put 'custom-mode 'mode-class 'special) -(define-obsolete-variable-alias 'custom-mode-hook 'Custom-mode-hook "23.1") (add-to-list 'debug-ignored-errors "^Invalid face:? ") === modified file 'lisp/desktop.el' --- lisp/desktop.el 2012-02-10 15:59:29 +0000 +++ lisp/desktop.el 2012-05-13 03:05:06 +0000 @@ -145,6 +145,8 @@ "Save status of Emacs when you exit." :group 'frames) +;; Maintained for backward compatibility +(define-obsolete-variable-alias 'desktop-enable 'desktop-save-mode "22.1") ;;;###autoload (define-minor-mode desktop-save-mode "Toggle desktop saving (Desktop Save mode). @@ -158,10 +160,6 @@ :global t :group 'desktop) -;; Maintained for backward compatibility -(define-obsolete-variable-alias 'desktop-enable - 'desktop-save-mode "22.1") - (defun desktop-save-mode-off () "Disable `desktop-save-mode'. Provided for use in hooks." (desktop-save-mode 0)) === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2012-02-22 04:02:44 +0000 +++ lisp/dired-x.el 2012-05-13 03:05:06 +0000 @@ -132,6 +132,8 @@ :type '(choice (const :tag "no maximum" nil) integer) :group 'dired-x) +;; For backward compatibility +(define-obsolete-variable-alias 'dired-omit-files-p 'dired-omit-mode "22.1") (define-minor-mode dired-omit-mode "Toggle omission of uninteresting files in Dired (Dired-Omit mode). With a prefix argument ARG, enable Dired-Omit mode if ARG is @@ -157,9 +159,6 @@ (put 'dired-omit-mode 'safe-local-variable 'booleanp) -;; For backward compatibility -(define-obsolete-variable-alias 'dired-omit-files-p 'dired-omit-mode "22.1") - (defcustom dired-omit-files "^\\.?#\\|^\\.$\\|^\\.\\.$" "Filenames matching this regexp will not be displayed. This only has effect when `dired-omit-mode' is t. See interactive function === modified file 'lisp/dirtrack.el' --- lisp/dirtrack.el 2012-02-08 02:12:24 +0000 +++ lisp/dirtrack.el 2012-05-13 03:05:06 +0000 @@ -179,6 +179,8 @@ dir)) +(define-obsolete-function-alias 'dirtrack-toggle 'dirtrack-mode "23.1") +(define-obsolete-variable-alias 'dirtrackp 'dirtrack-mode "23.1") ;;;###autoload (define-minor-mode dirtrack-mode "Toggle directory tracking in shell buffers (Dirtrack mode). @@ -198,10 +200,10 @@ (add-hook 'comint-preoutput-filter-functions 'dirtrack nil t) (remove-hook 'comint-preoutput-filter-functions 'dirtrack t))) -(define-obsolete-function-alias 'dirtrack-toggle 'dirtrack-mode "23.1") -(define-obsolete-variable-alias 'dirtrackp 'dirtrack-mode "23.1") - - + +(define-obsolete-function-alias 'dirtrack-debug-toggle 'dirtrack-debug-mode + "23.1") +(define-obsolete-variable-alias 'dirtrack-debug 'dirtrack-debug-mode "23.1") (define-minor-mode dirtrack-debug-mode "Toggle Dirtrack debugging. With a prefix argument ARG, enable Dirtrack debugging if ARG is @@ -211,11 +213,6 @@ (if dirtrack-debug-mode (display-buffer (get-buffer-create dirtrack-debug-buffer)))) -(define-obsolete-function-alias 'dirtrack-debug-toggle 'dirtrack-debug-mode - "23.1") -(define-obsolete-variable-alias 'dirtrack-debug 'dirtrack-debug-mode "23.1") - - (defun dirtrack-debug-message (msg1 msg2) "Insert strings at the end of `dirtrack-debug-buffer'." (when dirtrack-debug-mode === modified file 'lisp/dos-fns.el' --- lisp/dos-fns.el 2012-01-19 07:21:25 +0000 +++ lisp/dos-fns.el 2012-05-13 03:05:06 +0000 @@ -233,15 +233,15 @@ (add-hook 'before-init-hook 'dos-reevaluate-defcustoms) +(define-obsolete-variable-alias + 'register-name-alist 'dos-register-name-alist "24.1") + (defvar dos-register-name-alist '((ax . 0) (bx . 1) (cx . 2) (dx . 3) (si . 4) (di . 5) (cflag . 6) (flags . 7) (al . (0 . 0)) (bl . (1 . 0)) (cl . (2 . 0)) (dl . (3 . 0)) (ah . (0 . 1)) (bh . (1 . 1)) (ch . (2 . 1)) (dh . (3 . 1)))) -(define-obsolete-variable-alias - 'register-name-alist 'dos-register-name-alist "24.1") - (defun dos-make-register () (make-vector 8 0)) === modified file 'lisp/emacs-lisp/chart.el' --- lisp/emacs-lisp/chart.el 2012-04-09 13:05:48 +0000 +++ lisp/emacs-lisp/chart.el 2012-05-13 03:05:06 +0000 @@ -62,8 +62,8 @@ (require 'eieio) ;;; Code: +(define-obsolete-variable-alias 'chart-map 'chart-mode-map "24.1") (defvar chart-mode-map (make-sparse-keymap) "Keymap used in chart mode.") -(define-obsolete-variable-alias 'chart-map 'chart-mode-map "24.1") (defvar chart-local-object nil "Local variable containing the locally displayed chart object.") === modified file 'lisp/emacs-lisp/generic.el' --- lisp/emacs-lisp/generic.el 2012-01-19 07:21:25 +0000 +++ lisp/emacs-lisp/generic.el 2012-05-13 03:05:06 +0000 @@ -97,10 +97,11 @@ ;; Internal Variables ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(define-obsolete-variable-alias 'generic-font-lock-defaults + 'generic-font-lock-keywords "22.1") (defvar generic-font-lock-keywords nil "Keywords for `font-lock-defaults' in a generic mode.") (make-variable-buffer-local 'generic-font-lock-keywords) -(define-obsolete-variable-alias 'generic-font-lock-defaults 'generic-font-lock-keywords "22.1") ;;;###autoload (defvar generic-mode-list nil === modified file 'lisp/emacs-lock.el' --- lisp/emacs-lock.el 2012-04-14 03:11:18 +0000 +++ lisp/emacs-lock.el 2012-05-13 03:05:06 +0000 @@ -186,6 +186,8 @@ ;; anything else (turn off) mode)))) +(define-obsolete-variable-alias 'emacs-lock-from-exiting + 'emacs-lock-mode "24.1") ;;;###autoload (define-minor-mode emacs-lock-mode "Toggle Emacs Lock mode in the current buffer. @@ -245,8 +247,6 @@ ;;; Compatibility -(define-obsolete-variable-alias 'emacs-lock-from-exiting 'emacs-lock-mode "24.1") - (defun toggle-emacs-lock () "Toggle `emacs-lock-from-exiting' for the current buffer." (interactive) === modified file 'lisp/emulation/tpu-edt.el' --- lisp/emulation/tpu-edt.el 2012-02-28 08:17:21 +0000 +++ lisp/emulation/tpu-edt.el 2012-05-13 03:05:06 +0000 @@ -315,6 +315,7 @@ ;;; Global Keymaps ;;; +(define-obsolete-variable-alias 'GOLD-map 'tpu-gold-map "23.1") (defvar tpu-gold-map (let ((map (make-keymap))) ;; Previously we used escape sequences here. We now instead presume @@ -494,7 +495,6 @@ map) "Maps the function keys on the VT100 keyboard preceded by PF1. GOLD is the ASCII 7-bit escape sequence OP.") -(define-obsolete-variable-alias 'GOLD-map 'tpu-gold-map "23.1") (defvar tpu-global-map (let ((map (make-sparse-keymap))) === modified file 'lisp/files.el' --- lisp/files.el 2012-05-09 03:06:08 +0000 +++ lisp/files.el 2012-05-13 03:05:06 +0000 @@ -415,13 +415,13 @@ ;;;It is not useful to make this a local variable. ;;;(put 'find-file-not-found-hooks 'permanent-local t) +(define-obsolete-variable-alias 'find-file-not-found-hooks + 'find-file-not-found-functions "22.1") (defvar find-file-not-found-functions nil "List of functions to be called for `find-file' on nonexistent file. These functions are called as soon as the error is detected. Variable `buffer-file-name' is already set up. The functions are called in the order given until one of them returns non-nil.") -(define-obsolete-variable-alias 'find-file-not-found-hooks - 'find-file-not-found-functions "22.1") ;;;It is not useful to make this a local variable. ;;;(put 'find-file-hooks 'permanent-local t) @@ -435,6 +435,7 @@ :options '(auto-insert) :version "22.1") +(define-obsolete-variable-alias 'write-file-hooks 'write-file-functions "22.1") (defvar write-file-functions nil "List of functions to be called before writing out a buffer to a file. If one of them returns non-nil, the file is considered already written @@ -451,13 +452,14 @@ node `(elisp)Saving Buffers'.) To perform various checks or updates before the buffer is saved, use `before-save-hook'.") (put 'write-file-functions 'permanent-local t) -(define-obsolete-variable-alias 'write-file-hooks 'write-file-functions "22.1") (defvar local-write-file-hooks nil) (make-variable-buffer-local 'local-write-file-hooks) (put 'local-write-file-hooks 'permanent-local t) (make-obsolete-variable 'local-write-file-hooks 'write-file-functions "22.1") +(define-obsolete-variable-alias 'write-contents-hooks + 'write-contents-functions "22.1") (defvar write-contents-functions nil "List of functions to be called before writing out a buffer to a file. If one of them returns non-nil, the file is considered already written @@ -475,8 +477,6 @@ To perform various checks or updates before the buffer is saved, use `before-save-hook'.") (make-variable-buffer-local 'write-contents-functions) -(define-obsolete-variable-alias 'write-contents-hooks - 'write-contents-functions "22.1") (defcustom enable-local-variables t "Control use of local variables in files you visit. === modified file 'lisp/frame.el' --- lisp/frame.el 2012-04-16 18:41:38 +0000 +++ lisp/frame.el 2012-05-13 03:05:06 +0000 @@ -1612,6 +1612,8 @@ (cancel-timer blink-cursor-timer) (setq blink-cursor-timer nil))) +(define-obsolete-variable-alias 'blink-cursor 'blink-cursor-mode "22.1") + (define-minor-mode blink-cursor-mode "Toggle cursor blinking (Blink Cursor mode). With a prefix argument ARG, enable Blink Cursor mode if ARG is @@ -1638,8 +1640,6 @@ blink-cursor-delay 'blink-cursor-start)))) -(define-obsolete-variable-alias 'blink-cursor 'blink-cursor-mode "22.1") - ;;;; Key bindings @@ -1652,7 +1652,8 @@ ;; Misc. ;; Only marked as obsolete in 24.2. -(define-obsolete-variable-alias 'automatic-hscrolling 'auto-hscroll-mode "22.1") +(define-obsolete-variable-alias 'automatic-hscrolling + 'auto-hscroll-mode "22.1") (make-variable-buffer-local 'show-trailing-whitespace) === modified file 'lisp/loadhist.el' --- lisp/loadhist.el 2012-01-19 07:21:25 +0000 +++ lisp/loadhist.el 2012-05-13 03:05:06 +0000 @@ -143,13 +143,13 @@ `-hook' or `-hooks', from which `unload-feature' should try to remove pertinent symbols.") +(define-obsolete-variable-alias 'unload-hook-features-list + 'unload-function-defs-list "22.2") (defvar unload-function-defs-list nil "List of definitions in the Lisp library being unloaded. This is meant to be used by `FEATURE-unload-function'; see the documentation of `unload-feature' for details.") -(define-obsolete-variable-alias 'unload-hook-features-list - 'unload-function-defs-list "22.2") (defun unload--set-major-mode () (save-current-buffer === modified file 'lisp/novice.el' --- lisp/novice.el 2012-01-19 07:21:25 +0000 +++ lisp/novice.el 2012-05-13 03:05:06 +0000 @@ -36,13 +36,13 @@ (eval-when-compile (require 'cl)) ;;;###autoload +(define-obsolete-variable-alias 'disabled-command-hook + 'disabled-command-function "22.1") +;;;###autoload (defvar disabled-command-function 'disabled-command-function "Function to call to handle disabled commands. If nil, the feature is disabled, i.e., all commands work normally.") -;;;###autoload -(define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") - ;; It is ok here to assume that this-command is a symbol ;; because we won't get called otherwise. ;;;###autoload === modified file 'lisp/progmodes/meta-mode.el' --- lisp/progmodes/meta-mode.el 2012-01-19 07:21:25 +0000 +++ lisp/progmodes/meta-mode.el 2012-05-13 03:05:06 +0000 @@ -829,6 +829,7 @@ st) "Syntax table used in Metafont or MetaPost mode.") +(define-obsolete-variable-alias 'meta-mode-map 'meta-common-mode-map "24.1") (defvar meta-common-mode-map (let ((map (make-sparse-keymap))) ;; Comment Paragraphs: @@ -858,7 +859,6 @@ ;; (define-key map "\C-c\C-l" 'meta-recenter-output) map) "Keymap used in Metafont or MetaPost mode.") -(define-obsolete-variable-alias 'meta-mode-map 'meta-common-mode-map "24.1") (easy-menu-define meta-mode-menu meta-common-mode-map === modified file 'lisp/speedbar.el' --- lisp/speedbar.el 2012-04-28 21:59:08 +0000 +++ lisp/speedbar.el 2012-05-13 03:05:06 +0000 @@ -774,6 +774,8 @@ (defvar speedbar-update-flag-disable nil "Permanently disable changing of the update flag.") +(define-obsolete-variable-alias + 'speedbar-syntax-table 'speedbar-mode-syntax-table "24.1") (defvar speedbar-mode-syntax-table (let ((st (make-syntax-table))) ;; Turn off paren matching around here. @@ -787,10 +789,9 @@ (modify-syntax-entry ?\] " " st) st) "Syntax-table used on the speedbar.") -(define-obsolete-variable-alias - 'speedbar-syntax-table 'speedbar-mode-syntax-table "24.1") - - + + +(define-obsolete-variable-alias 'speedbar-key-map 'speedbar-mode-map "24.1") (defvar speedbar-mode-map (let ((map (make-keymap))) (suppress-keymap map t) @@ -825,7 +826,6 @@ (dframe-update-keymap map) map) "Keymap used in speedbar buffer.") -(define-obsolete-variable-alias 'speedbar-key-map 'speedbar-mode-map "24.1") (defun speedbar-make-specialized-keymap () "Create a keymap for use with a speedbar major or minor display mode. === modified file 'lisp/textmodes/reftex-index.el' --- lisp/textmodes/reftex-index.el 2012-01-19 07:21:25 +0000 +++ lisp/textmodes/reftex-index.el 2012-05-13 03:05:06 +0000 @@ -274,6 +274,8 @@ (and newtag (cdr cell) (not (member newtag (cdr cell))) (push newtag (cdr cell))))) +(define-obsolete-variable-alias + 'reftex-index-map 'reftex-index-mode-map "24.1") (defvar reftex-index-mode-map (let ((map (make-sparse-keymap))) ;; Index map @@ -377,8 +379,6 @@ map) "Keymap used for *Index* buffers.") -(define-obsolete-variable-alias - 'reftex-index-map 'reftex-index-mode-map "24.1") (defvar reftex-index-menu) @@ -1179,6 +1179,8 @@ "Font lock keywords for reftex-index-phrases-mode.") (defvar reftex-index-phrases-font-lock-defaults nil "Font lock defaults for reftex-index-phrases-mode.") +(define-obsolete-variable-alias + 'reftex-index-phrases-map 'reftex-index-phrases-mode-map "24.1") (defvar reftex-index-phrases-mode-map (let ((map (make-sparse-keymap))) ;; Keybindings and Menu for phrases buffer @@ -1244,8 +1246,6 @@ map) "Keymap used for *toc* buffer.") -(define-obsolete-variable-alias - 'reftex-index-phrases-map 'reftex-index-phrases-mode-map "24.1") (defun reftex-index-phrase-selection-or-word (arg) === modified file 'lisp/textmodes/reftex-sel.el' --- lisp/textmodes/reftex-sel.el 2012-01-19 07:21:25 +0000 +++ lisp/textmodes/reftex-sel.el 2012-05-13 03:05:06 +0000 @@ -71,6 +71,8 @@ (define-key map "-" 'negative-argument) map)) +(define-obsolete-variable-alias + 'reftex-select-label-map 'reftex-select-label-mode-map "24.1") (defvar reftex-select-label-mode-map (let ((map (make-sparse-keymap))) (set-keymap-parent map reftex-select-shared-map) @@ -102,8 +104,6 @@ "Keymap used for *RefTeX Select* buffer, when selecting a label. This keymap can be used to configure the label selection process which is started with the command \\[reftex-reference].") -(define-obsolete-variable-alias - 'reftex-select-label-map 'reftex-select-label-mode-map "24.1") (define-derived-mode reftex-select-label-mode fundamental-mode "LSelect" "Major mode for selecting a label in a LaTeX document. @@ -126,6 +126,8 @@ ;; We do not set a local map - reftex-select-item does this. ) +(define-obsolete-variable-alias + 'reftex-select-bib-map 'reftex-select-bib-mode-map "24.1") (defvar reftex-select-bib-mode-map (let ((map (make-sparse-keymap))) (set-keymap-parent map reftex-select-shared-map) @@ -147,8 +149,6 @@ "Keymap used for *RefTeX Select* buffer, when selecting a BibTeX entry. This keymap can be used to configure the BibTeX selection process which is started with the command \\[reftex-citation].") -(define-obsolete-variable-alias - 'reftex-select-bib-map 'reftex-select-bib-mode-map "24.1") (define-derived-mode reftex-select-bib-mode fundamental-mode "BSelect" "Major mode for selecting a citation key in a LaTeX document. === modified file 'lisp/textmodes/reftex-toc.el' --- lisp/textmodes/reftex-toc.el 2012-01-19 07:21:25 +0000 +++ lisp/textmodes/reftex-toc.el 2012-05-13 03:05:06 +0000 @@ -31,6 +31,7 @@ (require 'reftex) ;;; +(define-obsolete-variable-alias 'reftex-toc-map 'reftex-toc-mode-map "24.1") (defvar reftex-toc-mode-map (let ((map (make-sparse-keymap))) @@ -122,7 +123,6 @@ map) "Keymap used for *toc* buffer.") -(define-obsolete-variable-alias 'reftex-toc-map 'reftex-toc-mode-map "24.1") (defvar reftex-toc-menu) (defvar reftex-last-window-height nil) === modified file 'lisp/tooltip.el' --- lisp/tooltip.el 2012-02-08 02:12:24 +0000 +++ lisp/tooltip.el 2012-05-13 03:05:06 +0000 @@ -154,6 +154,8 @@ ;;; Variables that are not customizable. +(define-obsolete-variable-alias 'tooltip-hook 'tooltip-functions "23.1") + (defvar tooltip-functions nil "Functions to call to display tooltips. Each function is called with one argument EVENT which is a copy @@ -161,8 +163,6 @@ functions displays the tooltip, it should return non-nil and the rest are not called.") -(define-obsolete-variable-alias 'tooltip-hook 'tooltip-functions "23.1") - (defvar tooltip-timeout-id nil "The id of the timeout started when Emacs becomes idle.") === modified file 'lisp/vc/log-edit.el' --- lisp/vc/log-edit.el 2012-05-08 15:19:18 +0000 +++ lisp/vc/log-edit.el 2012-05-13 03:05:06 +0000 @@ -195,7 +195,10 @@ (defconst log-edit-maximum-comment-ring-size 32 "Maximum number of saved comments in the comment ring.") +(define-obsolete-variable-alias 'vc-comment-ring 'log-edit-comment-ring "22.1") (defvar log-edit-comment-ring (make-ring log-edit-maximum-comment-ring-size)) +(define-obsolete-variable-alias 'vc-comment-ring-index + 'log-edit-comment-ring-index "22.1") (defvar log-edit-comment-ring-index nil) (defvar log-edit-last-comment-match "") @@ -301,8 +304,6 @@ (insert "\n")))) ;; Compatibility with old names. -(define-obsolete-variable-alias 'vc-comment-ring 'log-edit-comment-ring "22.1") -(define-obsolete-variable-alias 'vc-comment-ring-index 'log-edit-comment-ring-index "22.1") (define-obsolete-function-alias 'vc-previous-comment 'log-edit-previous-comment "22.1") (define-obsolete-function-alias 'vc-next-comment 'log-edit-next-comment "22.1") (define-obsolete-function-alias 'vc-comment-search-reverse 'log-edit-comment-search-backward "22.1") ------------------------------------------------------------ revno: 108212 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-05-12 11:10:37 -0700 message: Remove trailing / from $ns_appbindir * configure.in (ns_appbindir): Remove trailing "/". * src/ns.mk: Update for ns_appbindir no longer having trailing "/". diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-12 00:57:48 +0000 +++ ChangeLog 2012-05-12 18:10:37 +0000 @@ -1,5 +1,7 @@ 2012-05-12 Glenn Morris + * configure.in (ns_appbindir): Remove trailing "/". + * configure.in (AC_PROG_MKDIR_P): Call it, to set MKDIR_P. (MKDEPDIR): Use $MKDIR_P. * Makefile.in (MKDIR_P): New, set by configure. === modified file 'configure.in' --- configure.in 2012-05-12 00:57:48 +0000 +++ configure.in 2012-05-12 18:10:37 +0000 @@ -1568,20 +1568,17 @@ CFLAGS="$CFLAGS -x objective-c" TEMACS_LDFLAGS2="\${LDFLAGS}" GNU_OBJC_CFLAGS= -dnl I don't think it's especially important, but src/Makefile.in -dnl (now the only user of ns_appdir) used to go to the trouble of adding a -dnl trailing "/" to it, so now we do it here. if test "${with_ns}" != no; then if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes ns_appdir=`pwd`/nextstep/Emacs.app - ns_appbindir=${ns_appdir}/Contents/MacOS/ + ns_appbindir=${ns_appdir}/Contents/MacOS ns_appresdir=${ns_appdir}/Contents/Resources ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base elif test -f $GNUSTEP_CONFIG_FILE; then NS_IMPL_GNUSTEP=yes ns_appdir=`pwd`/nextstep/Emacs.app - ns_appbindir=${ns_appdir}/ + ns_appbindir=${ns_appdir} ns_appresdir=${ns_appdir}/Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base dnl FIXME sourcing this several times in subshells seems inefficient. === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-12 13:05:12 +0000 +++ src/ChangeLog 2012-05-12 18:10:37 +0000 @@ -1,3 +1,7 @@ +2012-05-12 Glenn Morris + + * ns.mk: Update for ns_appbindir no longer having trailing "/". + 2012-05-12 Eli Zaretskii * lisp.mk (lisp): Add newcomment.elc. === modified file 'src/ns.mk' --- src/ns.mk 2012-05-12 00:57:48 +0000 +++ src/ns.mk 2012-05-12 18:10:37 +0000 @@ -30,10 +30,10 @@ ${MKDIR_P} ${ns_appdir} ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - ) -${ns_appbindir}Emacs: emacs${EXEEXT} +${ns_appbindir}/Emacs: emacs${EXEEXT} ${MKDIR_P} ${ns_appbindir} - cp -f emacs${EXEEXT} ${ns_appbindir}Emacs + cp -f emacs${EXEEXT} ${ns_appbindir}/Emacs -ns-app: ${ns_appdir} ${ns_appbindir}Emacs +ns-app: ${ns_appdir} ${ns_appbindir}/Emacs ### ns.mk ends here ------------------------------------------------------------ revno: 108211 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-05-12 11:04:06 -0700 message: * doc/misc/Makefile.in (mostlyclean): Add still more TeX intermediates. diff: === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2012-05-12 18:03:18 +0000 +++ doc/misc/Makefile.in 2012-05-12 18:04:06 +0000 @@ -665,7 +665,7 @@ mostlyclean: rm -f *.aux *.log *.toc *.c[mp] *.c[mp]s *.fn *.fns \ - *.ky *.kys *.op *.ops *.p[gj] *.p[gj]s *.sc *.scs \ + *.ky *.kys *.op *.ops *.p[gj] *.p[gj]s *.sc *.scs *.ss \ *.t[gp] *.t[gp]s *.vr *.vrs rm -f gnustmp.* ------------------------------------------------------------ revno: 108210 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-05-12 11:03:18 -0700 message: * .bzrignore, doc/misc/Makefile.in (mostlyclean): Add more TeX intermediates. diff: === modified file '.bzrignore' --- .bzrignore 2012-05-05 09:40:49 +0000 +++ .bzrignore 2012-05-12 18:03:18 +0000 @@ -37,6 +37,8 @@ cxxdefs.h # Intermediate files when making pdf versions of the manuals. doc/**/*.aux +doc/**/*.cm +doc/**/*.cms doc/**/*.cp doc/**/*.cps doc/**/*.fn @@ -47,8 +49,17 @@ doc/**/*.op doc/**/*.ops doc/**/*.pg +doc/**/*.pgs +doc/**/*.pj +doc/**/*.pjs +doc/**/*.sc +doc/**/*.scs +doc/**/*.ss +doc/**/*.tg +doc/**/*.tgs doc/**/*.toc doc/**/*.tp +doc/**/*.tps doc/**/*.vr doc/**/*.vrs doc/**/*.pdf === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-05-12 16:44:01 +0000 +++ doc/misc/ChangeLog 2012-05-12 18:03:18 +0000 @@ -1,5 +1,7 @@ 2012-05-12 Glenn Morris + * Makefile.in (mostlyclean): Add more TeX intermediates. + * Makefile.in: Make it look more like the other doc Makefiles. Use explicit $srcdir in all dependencies. Remove cd $srcdir from rules. === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2012-05-12 16:44:01 +0000 +++ doc/misc/Makefile.in 2012-05-12 18:03:18 +0000 @@ -664,8 +664,9 @@ .PHONY: mostlyclean clean distclean maintainer-clean mostlyclean: - rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \ - *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs + rm -f *.aux *.log *.toc *.c[mp] *.c[mp]s *.fn *.fns \ + *.ky *.kys *.op *.ops *.p[gj] *.p[gj]s *.sc *.scs \ + *.t[gp] *.t[gp]s *.vr *.vrs rm -f gnustmp.* clean: mostlyclean ------------------------------------------------------------ revno: 108209 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-05-12 09:44:01 -0700 message: Make doc/misc/Makefile.in look more like the other doc Makefiles * doc/misc/Makefile.in: Use explicit $srcdir in all dependencies. Remove cd $srcdir from rules. (VPATH): Remove. (infodir): Set to an absolute path. (INFO_TARGETS): Use short names. (mkinfodir): infodir is now absolute. (echo-info, maintainer-clean): Update for new format of INFO_TARGETS. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-05-12 02:05:05 +0000 +++ doc/misc/ChangeLog 2012-05-12 16:44:01 +0000 @@ -1,5 +1,14 @@ 2012-05-12 Glenn Morris + * Makefile.in: Make it look more like the other doc Makefiles. + Use explicit $srcdir in all dependencies. + Remove cd $srcdir from rules. + (VPATH): Remove. + (infodir): Set to an absolute path. + (INFO_TARGETS): Use short names. + (mkinfodir): infodir is now absolute. + (echo-info, maintainer-clean): Update for new format of INFO_TARGETS. + * Makefile.in (info.info): Rename from info, to avoid duplication. (.SUFFIXES): Disable implicit rules. === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2012-05-12 02:05:05 +0000 +++ doc/misc/Makefile.in 2012-05-12 16:44:01 +0000 @@ -24,16 +24,8 @@ # set by the configure script's `--srcdir' option. srcdir=@srcdir@ -# Tell make where to find source files; this is needed for the makefiles. -# Note the other doc Makefiles do not use VPATH anymore, instead -# they set infodir to an absolute path. Not doing that here in -# case INFO_TARGETS gets too long for some feeble shells. -# (cf src/Makefile.in's passing of $lisp to make-docfile) -VPATH=@srcdir@ - ## Where the output files go. -## Note that the setfilename command in the .texi files assumes this. -infodir=../../info +infodir = $(srcdir)/../../info ## Directory with emacsver.texi. ## Currently only used by efaq and calc. emacsdir = $(srcdir)/../emacs @@ -49,57 +41,14 @@ MAKEINFO = @MAKEINFO@ MAKEINFO_OPTS = --force -I$(emacsdir) -INFO_TARGETS = \ - $(infodir)/ada-mode$(INFO_EXT) \ - $(infodir)/auth$(INFO_EXT) \ - $(infodir)/autotype$(INFO_EXT) \ - $(infodir)/calc$(INFO_EXT) \ - $(infodir)/ccmode$(INFO_EXT) \ - $(infodir)/cl$(INFO_EXT) \ - $(infodir)/dbus$(INFO_EXT) \ - $(infodir)/dired-x$(INFO_EXT) \ - $(infodir)/ebrowse$(INFO_EXT) \ - $(infodir)/ede$(INFO_EXT) \ - $(infodir)/ediff$(INFO_EXT) \ - $(infodir)/edt$(INFO_EXT) \ - $(infodir)/eieio$(INFO_EXT) \ - $(infodir)/emacs-mime$(INFO_EXT) \ - $(infodir)/epa$(INFO_EXT) \ - $(infodir)/erc$(INFO_EXT) \ - $(infodir)/ert$(INFO_EXT) \ - $(infodir)/eshell$(INFO_EXT) \ - $(infodir)/eudc$(INFO_EXT) \ - $(infodir)/efaq$(INFO_EXT) \ - $(infodir)/flymake$(INFO_EXT) \ - $(infodir)/forms$(INFO_EXT) \ - $(infodir)/gnus$(INFO_EXT) \ - $(infodir)/emacs-gnutls$(INFO_EXT) \ - $(infodir)/idlwave$(INFO_EXT) \ - $(infodir)/info$(INFO_EXT) \ - $(infodir)/mairix-el$(INFO_EXT) \ - $(infodir)/message$(INFO_EXT) \ - $(infodir)/mh-e$(INFO_EXT) \ - $(infodir)/newsticker$(INFO_EXT) \ - $(infodir)/nxml-mode$(INFO_EXT) \ - $(infodir)/org$(INFO_EXT) \ - $(infodir)/pcl-cvs$(INFO_EXT) \ - $(infodir)/pgg$(INFO_EXT) \ - $(infodir)/rcirc$(INFO_EXT) \ - $(infodir)/remember$(INFO_EXT) \ - $(infodir)/reftex$(INFO_EXT) \ - $(infodir)/sasl$(INFO_EXT) \ - $(infodir)/sc$(INFO_EXT) \ - $(infodir)/semantic$(INFO_EXT) \ - $(infodir)/ses$(INFO_EXT) \ - $(infodir)/sieve$(INFO_EXT) \ - $(infodir)/smtpmail$(INFO_EXT) \ - $(infodir)/speedbar$(INFO_EXT) \ - $(infodir)/tramp$(INFO_EXT) \ - $(infodir)/url$(INFO_EXT) \ - $(infodir)/vip$(INFO_EXT) \ - $(infodir)/viper$(INFO_EXT) \ - $(infodir)/widget$(INFO_EXT) \ - $(infodir)/woman$(INFO_EXT) +INFO_TARGETS = ada-mode auth autotype calc ccmode cl \ + dbus dired-x ebrowse ede ediff edt eieio \ + emacs-mime epa erc ert eshell eudc efaq \ + flymake forms gnus emacs-gnutls idlwave info.info \ + mairix-el message mh-e newsticker nxml-mode \ + org pcl-cvs pgg rcirc remember reftex sasl \ + sc semantic ses sieve smtpmail speedbar tramp \ + url vip viper widget woman DVI_TARGETS = \ ada-mode.dvi \ @@ -213,7 +162,7 @@ ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \ MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" -mkinfodir = @${MKDIR_P} ${srcdir}/${infodir} +mkinfodir = @${MKDIR_P} ${infodir} .PHONY: info dvi pdf echo-info ## Prevent implicit rule triggering for foo.info. @@ -223,8 +172,10 @@ info: $(INFO_TARGETS) ## Used by top-level Makefile. +## Base file names of output info files. echo-info: - @echo $(INFO_TARGETS) | sed 's|[^ ]*/||g' + @echo "$(INFO_TARGETS) " | \ + sed -e 's|[^ ]*/||g' -e 's/\.info//g' -e "s/ /$(INFO_EXT) /g" # please modify this for all the web manual targets webhack: clean @@ -234,219 +185,196 @@ pdf: $(PDF_TARGETS) -# Note that all the Info targets build the Info files -# in srcdir. There is no provision for Info files -# to exist in the build directory. +# Note that all the Info targets build the Info files in srcdir. +# There is no provision for Info files to exist in the build directory. # In a distribution of Emacs, the Info files should be up to date. # Note: "<" is not portable in ordinary make rules. -## "short" target names for convenience, to just rebuild one manual. ada-mode : $(infodir)/ada-mode$(INFO_EXT) -$(infodir)/ada-mode$(INFO_EXT): ada-mode.texi +$(infodir)/ada-mode$(INFO_EXT): ${srcdir}/ada-mode.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ada-mode.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ada-mode.texi ada-mode.dvi: ${srcdir}/ada-mode.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi ada-mode.pdf: ${srcdir}/ada-mode.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi auth : $(infodir)/auth$(INFO_EXT) -$(infodir)/auth$(INFO_EXT): auth.texi +$(infodir)/auth$(INFO_EXT): ${srcdir}/auth.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ auth.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/auth.texi auth.dvi: ${srcdir}/auth.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi auth.pdf: ${srcdir}/auth.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi autotype : $(infodir)/autotype$(INFO_EXT) -$(infodir)/autotype$(INFO_EXT): autotype.texi +$(infodir)/autotype$(INFO_EXT): ${srcdir}/autotype.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ autotype.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/autotype.texi autotype.dvi: ${srcdir}/autotype.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi autotype.pdf: ${srcdir}/autotype.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi calc : $(infodir)/calc$(INFO_EXT) -$(infodir)/calc$(INFO_EXT): calc.texi $(emacsdir)/emacsver.texi +$(infodir)/calc$(INFO_EXT): ${srcdir}/calc.texi $(emacsdir)/emacsver.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ calc.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/calc.texi calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi ccmode : $(infodir)/ccmode$(INFO_EXT) -$(infodir)/ccmode$(INFO_EXT): cc-mode.texi +$(infodir)/ccmode$(INFO_EXT): ${srcdir}/cc-mode.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ cc-mode.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cc-mode.texi cc-mode.dvi: ${srcdir}/cc-mode.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi cc-mode.pdf: ${srcdir}/cc-mode.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi cl : $(infodir)/cl$(INFO_EXT) -$(infodir)/cl$(INFO_EXT): cl.texi +$(infodir)/cl$(INFO_EXT): ${srcdir}/cl.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ cl.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cl.texi cl.dvi: ${srcdir}/cl.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi cl.pdf: ${srcdir}/cl.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi dbus : $(infodir)/dbus$(INFO_EXT) -$(infodir)/dbus$(INFO_EXT): dbus.texi +$(infodir)/dbus$(INFO_EXT): ${srcdir}/dbus.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ dbus.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dbus.texi dbus.dvi: ${srcdir}/dbus.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi dbus.pdf: ${srcdir}/dbus.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi dired-x : $(infodir)/dired-x$(INFO_EXT) -$(infodir)/dired-x$(INFO_EXT): dired-x.texi $(emacsdir)/emacsver.texi +$(infodir)/dired-x$(INFO_EXT): ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ dired-x.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dired-x.texi dired-x.dvi: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi dired-x.pdf: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi ebrowse : $(infodir)/ebrowse$(INFO_EXT) -$(infodir)/ebrowse$(INFO_EXT): ebrowse.texi +$(infodir)/ebrowse$(INFO_EXT): ${srcdir}/ebrowse.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ebrowse.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ebrowse.texi ebrowse.dvi: ${srcdir}/ebrowse.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi ebrowse.pdf: ${srcdir}/ebrowse.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi ede : $(infodir)/ede$(INFO_EXT) -$(infodir)/ede$(INFO_EXT): ede.texi +$(infodir)/ede$(INFO_EXT): ${srcdir}/ede.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ede.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ede.texi ede.dvi: ${srcdir}/ede.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi ede.pdf: ${srcdir}/ede.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi ediff : $(infodir)/ediff$(INFO_EXT) -$(infodir)/ediff$(INFO_EXT): ediff.texi +$(infodir)/ediff$(INFO_EXT): ${srcdir}/ediff.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ediff.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ediff.texi ediff.dvi: ${srcdir}/ediff.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi ediff.pdf: ${srcdir}/ediff.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi edt : $(infodir)/edt$(INFO_EXT) -$(infodir)/edt$(INFO_EXT): edt.texi +$(infodir)/edt$(INFO_EXT): ${srcdir}/edt.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ edt.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/edt.texi edt.dvi: ${srcdir}/edt.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi edt.pdf: ${srcdir}/edt.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi eieio : $(infodir)/eieio$(INFO_EXT) -$(infodir)/eieio$(INFO_EXT): eieio.texi +$(infodir)/eieio$(INFO_EXT): ${srcdir}/eieio.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ eieio.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eieio.texi eieio.dvi: ${srcdir}/eieio.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi eieio.pdf: ${srcdir}/eieio.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi emacs-gnutls : $(infodir)/emacs-gnutls$(INFO_EXT) -$(infodir)/emacs-gnutls$(INFO_EXT): emacs-gnutls.texi +$(infodir)/emacs-gnutls$(INFO_EXT): ${srcdir}/emacs-gnutls.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ emacs-gnutls.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-gnutls.texi emacs-gnutls.dvi: ${srcdir}/emacs-gnutls.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-gnutls.texi emacs-gnutls.pdf: ${srcdir}/emacs-gnutls.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-gnutls.texi emacs-mime : $(infodir)/emacs-mime$(INFO_EXT) -$(infodir)/emacs-mime$(INFO_EXT): emacs-mime.texi +$(infodir)/emacs-mime$(INFO_EXT): ${srcdir}/emacs-mime.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) --enable-encoding -o $@ emacs-mime.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) --enable-encoding -o $@ ${srcdir}/emacs-mime.texi emacs-mime.dvi: ${srcdir}/emacs-mime.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi emacs-mime.pdf: ${srcdir}/emacs-mime.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi epa : $(infodir)/epa$(INFO_EXT) -$(infodir)/epa$(INFO_EXT): epa.texi +$(infodir)/epa$(INFO_EXT): ${srcdir}/epa.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ epa.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/epa.texi epa.dvi: ${srcdir}/epa.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi epa.pdf: ${srcdir}/epa.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi erc : $(infodir)/erc$(INFO_EXT) -$(infodir)/erc$(INFO_EXT): erc.texi +$(infodir)/erc$(INFO_EXT): ${srcdir}/erc.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ erc.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/erc.texi erc.dvi: ${srcdir}/erc.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi erc.pdf: ${srcdir}/erc.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi ert : $(infodir)/ert$(INFO_EXT) -$(infodir)/ert$(INFO_EXT): ert.texi +$(infodir)/ert$(INFO_EXT): ${srcdir}/ert.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ert.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ert.texi ert.dvi: ${srcdir}/ert.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ert.texi ert.pdf: ${srcdir}/ert.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi eshell : $(infodir)/eshell$(INFO_EXT) -$(infodir)/eshell$(INFO_EXT): eshell.texi +$(infodir)/eshell$(INFO_EXT): ${srcdir}/eshell.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ eshell.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eshell.texi eshell.dvi: ${srcdir}/eshell.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi eshell.pdf: ${srcdir}/eshell.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi eudc : $(infodir)/eudc$(INFO_EXT) -$(infodir)/eudc$(INFO_EXT): eudc.texi +$(infodir)/eudc$(INFO_EXT): ${srcdir}/eudc.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ eudc.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eudc.texi eudc.dvi: ${srcdir}/eudc.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi eudc.pdf: ${srcdir}/eudc.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi efaq : $(infodir)/efaq$(INFO_EXT) -$(infodir)/efaq$(INFO_EXT): faq.texi $(emacsdir)/emacsver.texi +$(infodir)/efaq$(INFO_EXT): ${srcdir}/faq.texi $(emacsdir)/emacsver.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ faq.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/faq.texi faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi @@ -462,20 +390,18 @@ $(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ ${srcdir}/faq.texi flymake : $(infodir)/flymake$(INFO_EXT) -$(infodir)/flymake$(INFO_EXT): flymake.texi +$(infodir)/flymake$(INFO_EXT): ${srcdir}/flymake.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ flymake.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/flymake.texi flymake.dvi: ${srcdir}/flymake.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi flymake.pdf: ${srcdir}/flymake.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi forms : $(infodir)/forms$(INFO_EXT) -$(infodir)/forms$(INFO_EXT): forms.texi +$(infodir)/forms$(INFO_EXT): ${srcdir}/forms.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ forms.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/forms.texi forms.dvi: ${srcdir}/forms.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi forms.pdf: ${srcdir}/forms.texi @@ -483,16 +409,15 @@ # gnus/message/emacs-mime/sieve/pgg are part of Gnus: gnus : $(infodir)/gnus$(INFO_EXT) -$(infodir)/gnus$(INFO_EXT): gnus.texi gnus-faq.texi +$(infodir)/gnus$(INFO_EXT): ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ gnus.texi -gnus.dvi: ${srcdir}/gnus.texi gnus-faq.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/gnus.texi +gnus.dvi: ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi $(ENVADD) $(TEXI2DVI) gnustmp.texi cp gnustmp.dvi $*.dvi rm gnustmp.* -gnus.pdf: ${srcdir}/gnus.texi gnus-faq.texi +gnus.pdf: ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi $(ENVADD) $(TEXI2PDF) gnustmp.texi cp gnustmp.pdf $@ @@ -500,10 +425,9 @@ # NB this one needs --no-split even without a .info extension. idlwave : $(infodir)/idlwave$(INFO_EXT) -$(infodir)/idlwave$(INFO_EXT): idlwave.texi +$(infodir)/idlwave$(INFO_EXT): ${srcdir}/idlwave.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ idlwave.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/idlwave.texi idlwave.dvi: ${srcdir}/idlwave.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi idlwave.pdf: ${srcdir}/idlwave.texi @@ -512,250 +436,225 @@ # NB this one needs --no-split even without a .info extension. # Avoid name clash with overall "info" target. info.info : $(infodir)/info$(INFO_EXT) -$(infodir)/info$(INFO_EXT): info.texi +$(infodir)/info$(INFO_EXT): ${srcdir}/info.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ info.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/info.texi info.dvi: ${srcdir}/info.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi info.pdf: ${srcdir}/info.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi mairix-el : $(infodir)/mairix-el$(INFO_EXT) -$(infodir)/mairix-el$(INFO_EXT): mairix-el.texi +$(infodir)/mairix-el$(INFO_EXT): ${srcdir}/mairix-el.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ mairix-el.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mairix-el.texi mairix-el.dvi: ${srcdir}/mairix-el.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi mairix-el.pdf: ${srcdir}/mairix-el.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi message : $(infodir)/message$(INFO_EXT) -$(infodir)/message$(INFO_EXT): message.texi +$(infodir)/message$(INFO_EXT): ${srcdir}/message.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ message.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/message.texi message.dvi: ${srcdir}/message.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi message.pdf: ${srcdir}/message.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi mh-e : $(infodir)/mh-e$(INFO_EXT) -$(infodir)/mh-e$(INFO_EXT): mh-e.texi +$(infodir)/mh-e$(INFO_EXT): ${srcdir}/mh-e.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ mh-e.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mh-e.texi mh-e.dvi: ${srcdir}/mh-e.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi mh-e.pdf: ${srcdir}/mh-e.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi newsticker : $(infodir)/newsticker$(INFO_EXT) -$(infodir)/newsticker$(INFO_EXT): newsticker.texi +$(infodir)/newsticker$(INFO_EXT): ${srcdir}/newsticker.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ newsticker.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/newsticker.texi newsticker.dvi: ${srcdir}/newsticker.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi newsticker.pdf: ${srcdir}/newsticker.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi nxml-mode : $(infodir)/nxml-mode$(INFO_EXT) -$(infodir)/nxml-mode$(INFO_EXT): nxml-mode.texi +$(infodir)/nxml-mode$(INFO_EXT): ${srcdir}/nxml-mode.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ nxml-mode.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/nxml-mode.texi nxml-mode.dvi: ${srcdir}/nxml-mode.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi nxml-mode.pdf: ${srcdir}/nxml-mode.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi org : $(infodir)/org$(INFO_EXT) -$(infodir)/org$(INFO_EXT): org.texi +$(infodir)/org$(INFO_EXT): ${srcdir}/org.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ org.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/org.texi org.dvi: ${srcdir}/org.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi org.pdf: ${srcdir}/org.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi pcl-cvs : $(infodir)/pcl-cvs$(INFO_EXT) -$(infodir)/pcl-cvs$(INFO_EXT): pcl-cvs.texi +$(infodir)/pcl-cvs$(INFO_EXT): ${srcdir}/pcl-cvs.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ pcl-cvs.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pcl-cvs.texi pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi pcl-cvs.pdf: ${srcdir}/pcl-cvs.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi pgg : $(infodir)/pgg$(INFO_EXT) -$(infodir)/pgg$(INFO_EXT): pgg.texi +$(infodir)/pgg$(INFO_EXT): ${srcdir}/pgg.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ pgg.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pgg.texi pgg.dvi: ${srcdir}/pgg.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi pgg.pdf: ${srcdir}/pgg.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi rcirc : $(infodir)/rcirc$(INFO_EXT) -$(infodir)/rcirc$(INFO_EXT): rcirc.texi +$(infodir)/rcirc$(INFO_EXT): ${srcdir}/rcirc.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ rcirc.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/rcirc.texi rcirc.dvi: ${srcdir}/rcirc.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi rcirc.pdf: ${srcdir}/rcirc.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi reftex : $(infodir)/reftex$(INFO_EXT) -$(infodir)/reftex$(INFO_EXT): reftex.texi +$(infodir)/reftex$(INFO_EXT): ${srcdir}/reftex.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ reftex.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/reftex.texi reftex.dvi: ${srcdir}/reftex.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi reftex.pdf: ${srcdir}/reftex.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi remember : $(infodir)/remember$(INFO_EXT) -$(infodir)/remember$(INFO_EXT): remember.texi +$(infodir)/remember$(INFO_EXT): ${srcdir}/remember.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ remember.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/remember.texi remember.dvi: ${srcdir}/remember.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi remember.pdf: ${srcdir}/remember.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi sasl : $(infodir)/sasl$(INFO_EXT) -$(infodir)/sasl$(INFO_EXT): sasl.texi +$(infodir)/sasl$(INFO_EXT): ${srcdir}/sasl.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ sasl.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sasl.texi sasl.dvi: ${srcdir}/sasl.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi sasl.pdf: ${srcdir}/sasl.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi sc : $(infodir)/sc$(INFO_EXT) -$(infodir)/sc$(INFO_EXT): sc.texi +$(infodir)/sc$(INFO_EXT): ${srcdir}/sc.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ sc.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sc.texi sc.dvi: ${srcdir}/sc.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi sc.pdf: ${srcdir}/sc.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi semantic : $(infodir)/semantic$(INFO_EXT) -$(infodir)/semantic$(INFO_EXT): semantic.texi sem-user.texi +$(infodir)/semantic$(INFO_EXT): ${srcdir}/semantic.texi ${srcdir}/sem-user.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ semantic.texi -semantic.dvi: ${srcdir}/semantic.texi sem-user.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/semantic.texi +semantic.dvi: ${srcdir}/semantic.texi ${srcdir}/sem-user.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi -semantic.pdf: ${srcdir}/semantic.texi sem-user.texi +semantic.pdf: ${srcdir}/semantic.texi ${srcdir}/sem-user.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi ses : $(infodir)/ses$(INFO_EXT) -$(infodir)/ses$(INFO_EXT): ses.texi +$(infodir)/ses$(INFO_EXT): ${srcdir}/ses.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ses.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ses.texi ses.dvi: ${srcdir}/ses.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi ses.pdf: ${srcdir}/ses.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi sieve : $(infodir)/sieve$(INFO_EXT) -$(infodir)/sieve$(INFO_EXT): sieve.texi +$(infodir)/sieve$(INFO_EXT): ${srcdir}/sieve.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ sieve.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sieve.texi sieve.dvi: ${srcdir}/sieve.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi sieve.pdf: ${srcdir}/sieve.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi smtpmail : $(infodir)/smtpmail$(INFO_EXT) -$(infodir)/smtpmail$(INFO_EXT): smtpmail.texi +$(infodir)/smtpmail$(INFO_EXT): ${srcdir}/smtpmail.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ smtpmail.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/smtpmail.texi smtpmail.dvi: ${srcdir}/smtpmail.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi smtpmail.pdf: ${srcdir}/smtpmail.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi speedbar : $(infodir)/speedbar$(INFO_EXT) -$(infodir)/speedbar$(INFO_EXT): speedbar.texi +$(infodir)/speedbar$(INFO_EXT): ${srcdir}/speedbar.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ speedbar.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/speedbar.texi speedbar.dvi: ${srcdir}/speedbar.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi speedbar.pdf: ${srcdir}/speedbar.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi tramp : $(infodir)/tramp$(INFO_EXT) -$(infodir)/tramp$(INFO_EXT): tramp.texi trampver.texi +$(infodir)/tramp$(INFO_EXT): ${srcdir}/tramp.texi ${srcdir}/trampver.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ -D emacs tramp.texi -tramp.dvi: ${srcdir}/tramp.texi trampver.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ -D emacs ${srcdir}/tramp.texi +tramp.dvi: ${srcdir}/tramp.texi ${srcdir}/trampver.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi -tramp.pdf: ${srcdir}/tramp.texi trampver.texi +tramp.pdf: ${srcdir}/tramp.texi ${srcdir}/trampver.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi url : $(infodir)/url$(INFO_EXT) -$(infodir)/url$(INFO_EXT): url.texi +$(infodir)/url$(INFO_EXT): ${srcdir}/url.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ url.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/url.texi url.dvi: ${srcdir}/url.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi url.pdf: ${srcdir}/url.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi vip : $(infodir)/vip$(INFO_EXT) -$(infodir)/vip$(INFO_EXT): vip.texi +$(infodir)/vip$(INFO_EXT): ${srcdir}/vip.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ vip.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/vip.texi vip.dvi: ${srcdir}/vip.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi vip.pdf: ${srcdir}/vip.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi viper : $(infodir)/viper$(INFO_EXT) -$(infodir)/viper$(INFO_EXT): viper.texi +$(infodir)/viper$(INFO_EXT): ${srcdir}/viper.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ viper.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/viper.texi viper.dvi: ${srcdir}/viper.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi viper.pdf: ${srcdir}/viper.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi widget : $(infodir)/widget$(INFO_EXT) -$(infodir)/widget$(INFO_EXT): widget.texi +$(infodir)/widget$(INFO_EXT): ${srcdir}/widget.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ widget.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/widget.texi widget.dvi: ${srcdir}/widget.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi widget.pdf: ${srcdir}/widget.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi woman : $(infodir)/woman$(INFO_EXT) -$(infodir)/woman$(INFO_EXT): woman.texi +$(infodir)/woman$(INFO_EXT): ${srcdir}/woman.texi $(mkinfodir) - cd $(srcdir); \ - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ woman.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/woman.texi woman.dvi: ${srcdir}/woman.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi woman.pdf: ${srcdir}/woman.texi @@ -777,7 +676,8 @@ ## infodir is relative to srcdir. maintainer-clean: distclean - cd $(srcdir); for file in $(INFO_TARGETS); do \ + cd $(infodir); for file in $(INFO_TARGETS); do \ + file=`echo $${file} | sed 's/\.info$$//'`${INFO_EXT}; \ rm -f $${file} $${file}-[1-9] $${file}-[1-9][0-9]; \ done ------------------------------------------------------------ revno: 108208 fixes bug(s): http://debbugs.gnu.org/11459 committer: Chong Yidong branch nick: trunk timestamp: Sat 2012-05-12 23:04:11 +0800 message: Fix mouse links in new Buffer Menu. * buff-menu.el (Buffer-menu-mouse-select): Restore function. (Buffer-menu-mode-map): Bind it. (Buffer-menu--pretty-name): Add a mouse-face property. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-05-12 14:28:04 +0000 +++ lisp/ChangeLog 2012-05-12 15:04:11 +0000 @@ -1,6 +1,9 @@ 2012-05-12 Chong Yidong * buff-menu.el (Buffer-menu-buffer+size-width): Doc fix (Bug#11454). + (Buffer-menu-mouse-select): Restore function (Bug#11459). + (Buffer-menu-mode-map): Bind it. + (Buffer-menu--pretty-name): Add a mouse-face property. 2012-05-11 Stefan Monnier === modified file 'lisp/buff-menu.el' --- lisp/buff-menu.el 2012-05-12 14:28:04 +0000 +++ lisp/buff-menu.el 2012-05-12 15:04:11 +0000 @@ -130,6 +130,9 @@ (define-key map (kbd "M-s a C-s") 'Buffer-menu-isearch-buffers) (define-key map (kbd "M-s a M-C-s") 'Buffer-menu-isearch-buffers-regexp) + (define-key map [mouse-2] 'Buffer-menu-mouse-select) + (define-key map [follow-link] 'mouse-face) + (define-key map [menu-bar Buffer-menu-mode] (cons (purecopy "Buffer-Menu") menu-map)) (define-key menu-map [quit] `(menu-item ,(purecopy "Quit") quit-window @@ -565,6 +568,17 @@ (tabulated-list-print)) buffer)) +(defun Buffer-menu-mouse-select (event) + "Select the buffer whose line you click on." + (interactive "e") + (select-window (posn-window (event-end event))) + (let ((buffer (tabulated-list-get-id (posn-point (event-end event))))) + (when (buffer-live-p buffer) + (if (and (window-dedicated-p (selected-window)) + (eq (selected-window) (frame-root-window))) + (switch-to-buffer-other-frame buffer) + (switch-to-buffer buffer))))) + (defun list-buffers--refresh (&optional buffer-list old-buffer) ;; Set up `tabulated-list-format'. (let ((name-width Buffer-menu-name-width) @@ -617,7 +631,9 @@ (string-to-number (aref (cadr entry2) 4)))) (defun Buffer-menu--pretty-name (name) - (propertize name 'font-lock-face 'buffer-menu-buffer)) + (propertize name + 'font-lock-face 'buffer-menu-buffer + 'mouse-face 'highlight)) (defun Buffer-menu--pretty-file-name (file) (cond (file ------------------------------------------------------------ revno: 108207 fixes bug(s): http://debbugs.gnu.org/11454 committer: Chong Yidong branch nick: trunk timestamp: Sat 2012-05-12 22:28:04 +0800 message: * buff-menu.el (Buffer-menu-buffer+size-width): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-05-11 20:05:19 +0000 +++ lisp/ChangeLog 2012-05-12 14:28:04 +0000 @@ -1,3 +1,7 @@ +2012-05-12 Chong Yidong + + * buff-menu.el (Buffer-menu-buffer+size-width): Doc fix (Bug#11454). + 2012-05-11 Stefan Monnier * progmodes/prolog.el: Use SMIE. Cleanup regexp setup. === modified file 'lisp/buff-menu.el' --- lisp/buff-menu.el 2012-05-07 16:29:55 +0000 +++ lisp/buff-menu.el 2012-05-12 14:28:04 +0000 @@ -50,7 +50,11 @@ (defcustom Buffer-menu-buffer+size-width nil "Combined width of buffer name and size columns in Buffer Menu. -If nil, use `Buffer-menu-name-width' and `Buffer-menu-size-width'." +If nil, use `Buffer-menu-name-width' and `Buffer-menu-size-width'. + +If non-nil, the value of `Buffer-menu-name-width' is overridden; +the name column is assigned width `Buffer-menu-buffer+size-width' +minus `Buffer-menu-size-width'. This use is deprecated." :type 'number :group 'Buffer-menu :version "24.2") ------------------------------------------------------------ revno: 108206 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2012-05-12 16:05:12 +0300 message: Update src/lisp.mk as required by revision 108149. src/lisp.mk (lisp): Add newcomment.elc. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-12 00:57:48 +0000 +++ src/ChangeLog 2012-05-12 13:05:12 +0000 @@ -1,3 +1,7 @@ +2012-05-12 Eli Zaretskii + + * lisp.mk (lisp): Add newcomment.elc. + 2012-05-12 Glenn Morris * Makefile.in (MKDIR_P): New, set by configure. === modified file 'src/lisp.mk' --- src/lisp.mk 2012-05-06 16:45:46 +0000 +++ src/lisp.mk 2012-05-12 13:05:12 +0000 @@ -128,6 +128,7 @@ $(lispsource)/emacs-lisp/lisp-mode.elc \ $(lispsource)/textmodes/text-mode.elc \ $(lispsource)/textmodes/fill.elc \ + $(lispsource)/newcomment.elc \ $(lispsource)/replace.elc \ $(lispsource)/emacs-lisp/tabulated-list.elc \ $(lispsource)/buff-menu.elc \ ------------------------------------------------------------ revno: 108205 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-05-12 06:17:24 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2012-05-10 10:17:25 +0000 +++ autogen/configure 2012-05-12 10:17:24 +0000 @@ -7895,6 +7895,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "x$RANLIB" = x; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. @@ -10004,10 +10005,8 @@ fi if test $ac_enable_autodepend = yes; then DEPFLAGS='-MMD -MF ${DEPDIR}/$*.d -MP' - ## In parallel builds, another make might create depdir between - ## the first test and mkdir, so stick another test on the end. - ## Or use install-sh -d? mkdir -p is not portable. - MKDEPDIR='test -d ${DEPDIR} || mkdir ${DEPDIR} || test -d ${DEPDIR}' + ## MKDIR_P is documented (see AC_PROG_MKDIR_P) to be parallel-safe. + MKDEPDIR='${MKDIR_P} ${DEPDIR}' deps_frag=autodeps.mk fi fi ------------------------------------------------------------ revno: 108204 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-05-11 22:05:05 -0400 message: * doc/misc/Makefile.in (.SUFFIXES): Disable implicit rules. Fixes previous change. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-05-12 01:32:19 +0000 +++ doc/misc/ChangeLog 2012-05-12 02:05:05 +0000 @@ -1,6 +1,7 @@ 2012-05-12 Glenn Morris * Makefile.in (info.info): Rename from info, to avoid duplication. + (.SUFFIXES): Disable implicit rules. * Makefile.in (MKDIR_P): New, set by configure. (mkinfodir): Use $MKDIR_P. === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2012-05-12 01:32:19 +0000 +++ doc/misc/Makefile.in 2012-05-12 02:05:05 +0000 @@ -216,6 +216,8 @@ mkinfodir = @${MKDIR_P} ${srcdir}/${infodir} .PHONY: info dvi pdf echo-info +## Prevent implicit rule triggering for foo.info. +.SUFFIXES: # Default. info: $(INFO_TARGETS)