From: Karoly Lorentey Date: Sun, 22 Apr 2007 12:42:47 +0000 (+0000) Subject: Merged from emacs@sv.gnu.org X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~4 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d0799072a0d09bc14a99eaf372b262d1ba61399;p=emacs.git Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-674 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-675 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-676 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-677 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-678 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-679 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-680 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-681 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-682 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-683 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-684 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-685 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-686 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-687 Release ERC 5.2. * emacs@sv.gnu.org/emacs--devo--0--patch-688 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-689 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-690 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-691 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-692 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-693 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-694 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-695 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-696 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-697 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-698 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-699 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-700 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-701 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-209 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-210 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-211 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-212 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-213 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-214 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-215 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-601 --- 9d0799072a0d09bc14a99eaf372b262d1ba61399 diff --cc lisp/faces.el index 904db10efa5,a8c92ab9a75..47fb2fa0295 --- a/lisp/faces.el +++ b/lisp/faces.el @@@ -1803,13 -1789,9 +1803,9 @@@ Initialize colors of certain faces fro (condition-case () (progn (face-spec-set face (face-user-default-spec face) frame) - (internal-merge-in-global-face face frame) - (if (memq window-system '(x w32 mac)) + (if (memq (window-system frame) '(x w32 mac)) (make-face-x-resource-internal face frame)) - ;; If the user has customized the face, don't let X - ;; resources override the customizations. - (if (get face 'theme-face) - (custom-theme-recalc-face face))) + (internal-merge-in-global-face face frame)) (error nil))) ;; Apply the attributes specified by frame parameters. This ;; rewrites parameters changed by make-face-x-resource-internal diff --cc lisp/ldefs-boot.el index f9dac3493f1,b61a1ca2508..3932fd83f52 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@@ -4,7 -4,7 +4,7 @@@ ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best ;;;;;; 5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5" - ;;;;;; "play/5x5.el" (17888 36936)) -;;;;;; "play/5x5.el" (17941 38806)) ++;;;;;; "play/5x5.el" (17963 21010)) ;;; Generated autoloads from play/5x5.el (autoload (quote 5x5) "5x5" "\ @@@ -852,7 -852,7 +852,7 @@@ Not documente ;;;*** ;;;### (autoloads (animate-birthday-present animate-sequence animate-string) - ;;;;;; "animate" "play/animate.el" (17888 32280)) -;;;;;; "animate" "play/animate.el" (17941 38806)) ++;;;;;; "animate" "play/animate.el" (17963 21010)) ;;; Generated autoloads from play/animate.el (autoload (quote animate-string) "animate" "\ @@@ -1611,7 -1595,7 +1611,7 @@@ Calls `update-directory-autoloads' on t ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode ;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode) - ;;;;;; "autorevert" "autorevert.el" (17963 19298)) -;;;;;; "autorevert" "autorevert.el" (17925 15265)) ++;;;;;; "autorevert" "autorevert.el" (17963 20867)) ;;; Generated autoloads from autorevert.el (autoload (quote auto-revert-mode) "autorevert" "\ @@@ -2598,8 -2582,8 +2598,8 @@@ name of buffer configuration ;;;*** ;;;### (autoloads (insert-text-button make-text-button insert-button - ;;;;;; make-button define-button-type) "button" "button.el" (17888 - ;;;;;; 32278)) -;;;;;; make-button define-button-type) "button" "button.el" (17935 -;;;;;; 59428)) ++;;;;;; make-button define-button-type) "button" "button.el" (17963 ++;;;;;; 21008)) ;;; Generated autoloads from button.el (defvar button-map (let ((map (make-sparse-keymap))) (define-key map " " (quote push-button)) (define-key map [mouse-2] (quote push-button)) map) "\ @@@ -2687,7 -2671,7 +2687,7 @@@ Also see `make-text-button' ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile byte-compile-warnings-safe-p) "bytecomp" - ;;;;;; "emacs-lisp/bytecomp.el" (17963 19282)) -;;;;;; "emacs-lisp/bytecomp.el" (17949 41467)) ++;;;;;; "emacs-lisp/bytecomp.el" (17963 20998)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@@ -2925,7 -2909,7 +2925,7 @@@ See the documentation for `calculator-m ;;;;;; mark-holidays-in-calendar view-calendar-holidays-initially ;;;;;; calendar-remove-frame-by-deleting mark-diary-entries-in-calendar ;;;;;; view-diary-entries-initially calendar-offset) "calendar" - ;;;;;; "calendar/calendar.el" (17963 20580)) -;;;;;; "calendar/calendar.el" (17944 20140)) ++;;;;;; "calendar/calendar.el" (17963 20998)) ;;; Generated autoloads from calendar/calendar.el (defvar calendar-offset 0 "\ @@@ -3523,7 -3507,7 +3523,7 @@@ it fails ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" - ;;;;;; (17963 19063)) -;;;;;; (17942 63381)) ++;;;;;; (17963 20867)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload (quote c-guess-basic-syntax) "cc-engine" "\ @@@ -3535,7 -3519,7 +3535,7 @@@ Return the syntactic context of the cur ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode ;;;;;; c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" - ;;;;;; (17963 19063)) -;;;;;; (17926 45410)) ++;;;;;; (17963 20867)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload (quote c-initialize-cc-mode) "cc-mode" "\ @@@ -3751,7 -3735,7 +3751,7 @@@ and exists only for compatibility reaso ;;;*** - ;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (17888 36581)) -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (17941 38806)) ++;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (17963 21010)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@@ -4483,7 -4467,7 +4483,7 @@@ read/written by MS-DOS software, or fo ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list ;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command ;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el" - ;;;;;; (17963 19298)) -;;;;;; (17937 3189)) ++;;;;;; (17963 21008)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions (quote (comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)) "\ @@@ -4573,8 -4557,8 +4573,8 @@@ REGEXP-GROUP is the regular expression ;;;*** - ;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17888 - ;;;;;; 32279)) -;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17926 -;;;;;; 45410)) ++;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17963 ++;;;;;; 20867)) ;;; Generated autoloads from compare-w.el (autoload (quote compare-windows) "compare-w" "\ @@@ -4611,7 -4595,7 +4611,7 @@@ on third call it again advances points ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-mode-hook) - ;;;;;; "compile" "progmodes/compile.el" (17963 19298)) -;;;;;; "compile" "progmodes/compile.el" (17952 11093)) ++;;;;;; "compile" "progmodes/compile.el" (17963 20998)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@@ -4773,7 -4758,7 +4774,7 @@@ This is the value of `next-error-functi ;;;*** ;;;### (autoloads (partial-completion-mode) "complete" "complete.el" - ;;;;;; (17963 19063)) -;;;;;; (17954 15344)) ++;;;;;; (17963 21000)) ;;; Generated autoloads from complete.el (defvar partial-completion-mode nil "\ @@@ -6751,7 -6736,7 +6752,7 @@@ Not documente ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" - ;;;;;; "calendar/diary-lib.el" (17963 20580)) -;;;;;; "calendar/diary-lib.el" (17944 20140)) ++;;;;;; "calendar/diary-lib.el" (17963 20998)) ;;; Generated autoloads from calendar/diary-lib.el (autoload (quote diary) "diary-lib" "\ @@@ -7671,7 -7652,7 +7669,7 @@@ for users who call this function in `.e ;;;*** ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el" - ;;;;;; (17888 32280)) -;;;;;; (17941 38806)) ++;;;;;; (17963 21010)) ;;; Generated autoloads from play/dissociate.el (autoload (quote dissociated-press) "dissociate" "\ @@@ -7732,7 -7713,7 +7730,7 @@@ Locate SOA record and increment the ser ;;;*** - ;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17888 32280)) -;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17941 38806)) ++;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17963 21010)) ;;; Generated autoloads from play/doctor.el (autoload (quote doctor) "doctor" "\ @@@ -8488,7 -8469,7 +8486,7 @@@ With prefix arg NOCONFIRM, execute curr ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form ;;;;;; edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug" - ;;;;;; "emacs-lisp/edebug.el" (17963 19041)) -;;;;;; "emacs-lisp/edebug.el" (17952 11093)) ++;;;;;; "emacs-lisp/edebug.el" (17963 20999)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@@ -9196,7 -9193,7 +9194,7 @@@ Not documente ;;;*** ;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc" - ;;;;;; "erc/erc.el" (17888 32279)) -;;;;;; "erc/erc.el" (17935 53318)) ++;;;;;; "erc/erc.el" (17963 21006)) ;;; Generated autoloads from erc/erc.el (autoload (quote erc-select-read-args) "erc" "\ @@@ -9232,26 -9235,26 +9236,26 @@@ Otherwise, connect to HOST:PORT as USE ;;;*** - ;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17888 - ;;;;;; 32279)) -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17935 -;;;;;; 53318)) ++;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17963 ++;;;;;; 21006)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** - ;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17888 32279)) -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17935 53318)) ++;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17963 21006)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** - ;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (17888 32277)) -;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (17935 53318)) ++;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (17963 21006)) ;;; Generated autoloads from erc/erc-capab.el (autoload 'erc-capab-identify-mode "erc-capab" nil t) ;;;*** - ;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (17888 32279)) -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (17935 53318)) ++;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (17963 21006)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") @@@ -9352,8 -9355,8 +9356,8 @@@ Add EZBouncer convenience functions to ;;;*** - ;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17888 - ;;;;;; 32279)) -;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17935 -;;;;;; 53318)) ++;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17963 ++;;;;;; 21006)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@@ -9373,7 -9376,7 +9377,7 @@@ You can put this on `erc-insert-modify- ;;;*** ;;;### (autoloads (erc-identd-stop erc-identd-start) "erc-identd" - ;;;;;; "erc/erc-identd.el" (17888 32279)) -;;;;;; "erc/erc-identd.el" (17935 53318)) ++;;;;;; "erc/erc-identd.el" (17963 21006)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@@ -9412,7 -9415,7 +9416,7 @@@ Not documente ;;;*** ;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log" - ;;;;;; "erc/erc-log.el" (17888 32279)) -;;;;;; "erc/erc-log.el" (17935 53318)) ++;;;;;; "erc/erc-log.el" (17963 21006)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@@ -9444,7 -9447,7 +9448,7 @@@ You can save every individual message b ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host ;;;;;; erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool ;;;;;; erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el" - ;;;;;; (17888 32279)) -;;;;;; (17935 53318)) ++;;;;;; (17963 21006)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@@ -9490,14 -9493,14 +9494,14 @@@ Delete dangerous-host interactively to ;;;*** - ;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (17888 32279)) -;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (17935 53318)) ++;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (17963 21006)) ;;; Generated autoloads from erc/erc-menu.el (autoload 'erc-menu-mode "erc-menu" nil t) ;;;*** ;;;### (autoloads (erc-cmd-WHOLEFT) "erc-netsplit" "erc/erc-netsplit.el" - ;;;;;; (17888 32279)) -;;;;;; (17935 53318)) ++;;;;;; (17963 21006)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@@ -9509,7 -9512,7 +9513,7 @@@ Show who's gone ;;;*** ;;;### (autoloads (erc-server-select erc-determine-network) "erc-networks" - ;;;;;; "erc/erc-networks.el" (17888 32279)) -;;;;;; "erc/erc-networks.el" (17935 53318)) ++;;;;;; "erc/erc-networks.el" (17963 21006)) ;;; Generated autoloads from erc/erc-networks.el (autoload (quote erc-determine-network) "erc-networks" "\ @@@ -9527,7 -9530,7 +9531,7 @@@ Interactively select a server to connec ;;;*** ;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify" - ;;;;;; "erc/erc-notify.el" (17888 32279)) -;;;;;; "erc/erc-notify.el" (17935 53318)) ++;;;;;; "erc/erc-notify.el" (17963 21006)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@@ -9551,8 -9554,8 +9555,8 @@@ Not documente ;;;*** - ;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17888 - ;;;;;; 32279)) -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17935 -;;;;;; 53318)) ++;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17963 ++;;;;;; 21006)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) @@@ -9564,14 -9567,14 +9568,14 @@@ ;;;*** - ;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17888 32279)) -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17935 53318)) ++;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17963 21006)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** ;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode) - ;;;;;; "erc-services" "erc/erc-services.el" (17888 32279)) -;;;;;; "erc-services" "erc/erc-services.el" (17935 53318)) ++;;;;;; "erc-services" "erc/erc-services.el" (17963 21006)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@@ -9595,7 -9598,7 +9599,7 @@@ When called interactively, read the pas ;;;*** ;;;### (autoloads (erc-speedbar-browser) "erc-speedbar" "erc/erc-speedbar.el" - ;;;;;; (17888 32279)) -;;;;;; (17935 53318)) ++;;;;;; (17963 21006)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload (quote erc-speedbar-browser) "erc-speedbar" "\ @@@ -9606,23 -9609,39 +9610,39 @@@ This will add a speedbar major display ;;;*** - ;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17888 - ;;;;;; 32279)) -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17935 -;;;;;; 53318)) ++;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17963 ++;;;;;; 21006)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** - ;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17888 32279)) -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17935 53318)) ++;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17963 21006)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** - ;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17888 32279)) + ;;;### (autoloads (erc-track-minor-mode) "erc-track" "erc/erc-track.el" -;;;;;; (17935 53318)) ++;;;;;; (17963 21006)) ;;; Generated autoloads from erc/erc-track.el + + (defvar erc-track-minor-mode nil "\ + Non-nil if Erc-Track minor mode is enabled. + See the command `erc-track-minor-mode' for a description of this minor-mode.") + + (custom-autoload (quote erc-track-minor-mode) "erc-track" nil) + + (autoload (quote erc-track-minor-mode) "erc-track" "\ + Global minor mode for tracking ERC buffers and showing activity in the + mode line. + + This exists for the sole purpose of providing the C-c C-SPC and + C-c C-@ keybindings. Make sure that you have enabled the track + module, otherwise the keybindings will not do anything useful. + + \(fn &optional ARG)" t nil) (autoload 'erc-track-mode "erc-track" nil t) - (autoload 'erc-track-when-inactive-mode "erc-track" nil t) ;;;*** @@@ -10344,8 -10363,8 +10364,8 @@@ Edit the hotlist of directory servers i ;;;*** - ;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (17888 - ;;;;;; 32279)) -;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (17933 -;;;;;; 14283)) ++;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (17963 ++;;;;;; 21003)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload (quote ewoc-create) "ewoc" "\ @@@ -10416,7 -10435,8 +10436,8 @@@ file modes ;;;*** ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot - ;;;;;; expand-add-abbrevs) "expand" "expand.el" (17888 32279)) + ;;;;;; expand-abbrev-hook expand-add-abbrevs) "expand" "expand.el" -;;;;;; (17925 52793)) ++;;;;;; (17963 20867)) ;;; Generated autoloads from expand.el (autoload (quote expand-add-abbrevs) "expand" "\ @@@ -11317,7 -11303,7 +11344,7 @@@ Not documente ;;;*** ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode) - ;;;;;; "flymake" "progmodes/flymake.el" (17888 36581)) -;;;;;; "flymake" "progmodes/flymake.el" (17934 27588)) ++;;;;;; "flymake" "progmodes/flymake.el" (17963 21005)) ;;; Generated autoloads from progmodes/flymake.el (autoload (quote flymake-mode) "flymake" "\ @@@ -11341,7 -11327,7 +11368,7 @@@ Turn flymake mode off ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode) - ;;;;;; "flyspell" "textmodes/flyspell.el" (17888 32281)) -;;;;;; "flyspell" "textmodes/flyspell.el" (17942 63381)) ++;;;;;; "flyspell" "textmodes/flyspell.el" (17963 20998)) ;;; Generated autoloads from textmodes/flyspell.el (autoload (quote flyspell-prog-mode) "flyspell" "\ @@@ -11679,7 -11665,7 +11706,7 @@@ and choose the directory as the fortune ;;;*** ;;;### (autoloads (gdb-enable-debug gdba) "gdb-ui" "progmodes/gdb-ui.el" - ;;;;;; (17963 18447)) -;;;;;; (17941 38806)) ++;;;;;; (17963 21011)) ;;; Generated autoloads from progmodes/gdb-ui.el (autoload (quote gdba) "gdb-ui" "\ @@@ -11831,7 -11817,7 +11858,7 @@@ at places they belong to ;;;*** ;;;### (autoloads (gmm-tool-bar-from-list gmm-widget-p gmm-error - ;;;;;; gmm-message) "gmm-utils" "gnus/gmm-utils.el" (17888 32279)) -;;;;;; gmm-message) "gmm-utils" "gnus/gmm-utils.el" (17934 27588)) ++;;;;;; gmm-message) "gmm-utils" "gnus/gmm-utils.el" (17963 21006)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload (quote gmm-message) "gmm-utils" "\ @@@ -12022,7 -12008,7 +12049,7 @@@ If CLEAN, obsolete (ignore) ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" - ;;;;;; (17888 36581)) -;;;;;; (17938 29201)) ++;;;;;; (17963 21004)) ;;; Generated autoloads from gnus/gnus-art.el (autoload (quote gnus-article-prepare-display) "gnus-art" "\ @@@ -12373,7 -12359,7 +12400,7 @@@ Update the .newsrc.eld file to reflect ;;;*** ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail) - ;;;;;; "gnus-msg" "gnus/gnus-msg.el" (17888 32279)) -;;;;;; "gnus-msg" "gnus/gnus-msg.el" (17949 41467)) ++;;;;;; "gnus-msg" "gnus/gnus-msg.el" (17963 21010)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload (quote gnus-msg-mail) "gnus-msg" "\ @@@ -12510,7 -12496,7 +12537,7 @@@ Add NUM into sorted LIST by side effect ;;;*** ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) - ;;;;;; "gnus-registry" "gnus/gnus-registry.el" (17888 32279)) -;;;;;; "gnus-registry" "gnus/gnus-registry.el" (17934 27588)) ++;;;;;; "gnus-registry" "gnus/gnus-registry.el" (17963 21006)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload (quote gnus-registry-initialize) "gnus-registry" "\ @@@ -12613,7 -12599,7 +12640,7 @@@ Add the window configuration CONF to `g ;;;*** - ;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17888 32280)) -;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17941 38806)) ++;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17963 21010)) ;;; Generated autoloads from play/gomoku.el (autoload (quote gomoku) "gomoku" "\ @@@ -12824,7 -12810,7 +12851,7 @@@ the form \"WINDOW-ID PIXMAP-ID\". Valu ;;;*** ;;;### (autoloads (gdb-script-mode jdb pdb perldb xdb dbx sdb gdb) - ;;;;;; "gud" "progmodes/gud.el" (17963 19063)) -;;;;;; "gud" "progmodes/gud.el" (17950 21759)) ++;;;;;; "gud" "progmodes/gud.el" (17963 21011)) ;;; Generated autoloads from progmodes/gud.el (autoload (quote gdb) "gud" "\ @@@ -13535,8 -13520,8 +13562,8 @@@ how the hiding is done ;;;*** - ;;;### (autoloads (hs-minor-mode) "hideshow" "progmodes/hideshow.el" - ;;;;;; (17963 19041)) + ;;;### (autoloads (turn-off-hideshow hs-minor-mode) "hideshow" "progmodes/hideshow.el" -;;;;;; (17934 43341)) ++;;;;;; (17963 21006)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (quote ((c-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (c++-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (bibtex-mode ("^@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning))) "\ @@@ -14545,7 -14508,7 +14577,7 @@@ with no args, if that value is non-nil ;;;*** ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el" - ;;;;;; (17888 37036)) -;;;;;; (17935 59227)) ++;;;;;; (17963 21008)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload (quote idlwave-shell) "idlw-shell" "\ @@@ -14571,7 -14534,7 +14603,7 @@@ See also the variable `idlwave-shell-pr ;;;*** ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el" - ;;;;;; (17888 36588)) -;;;;;; (17935 59227)) ++;;;;;; (17963 21008)) ;;; Generated autoloads from progmodes/idlwave.el (autoload (quote idlwave-mode) "idlwave" "\ @@@ -14706,8 -14669,8 +14738,8 @@@ The main features of this mode ar ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17932 -;;;;;; 16456)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17963 - ;;;;;; 19298)) ++;;;;;; 21001)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@@ -15501,7 -15464,7 +15533,7 @@@ of `inferior-lisp-program'). Runs the ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node ;;;;;; Info-goto-emacs-command-node Info-mode info-apropos Info-index ;;;;;; Info-directory Info-on-current-buffer info-standalone info-emacs-manual - ;;;;;; info info-other-window) "info" "info.el" (17888 36929)) -;;;;;; info info-other-window) "info" "info.el" (17936 34375)) ++;;;;;; info info-other-window) "info" "info.el" (17963 21008)) ;;; Generated autoloads from info.el (autoload (quote info-other-window) "info" "\ @@@ -16612,7 -16544,7 +16644,7 @@@ Not documente ;;;*** ;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el" - ;;;;;; (17888 32280)) -;;;;;; (17941 38806)) ++;;;;;; (17963 21010)) ;;; Generated autoloads from play/landmark.el (defalias (quote landmark-repeat) (quote lm-test-run)) @@@ -17148,8 -17012,8 +17180,8 @@@ This function is suitable for executio ;;;*** - ;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17888 - ;;;;;; 32281)) -;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17923 -;;;;;; 63540)) ++;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17963 ++;;;;;; 20866)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload (quote m4-mode) "m4-mode" "\ @@@ -17593,7 -17457,7 +17625,7 @@@ Previous contents of that buffer are ki ;;;*** - ;;;### (autoloads (man-follow man) "man" "man.el" (17888 32280)) -;;;### (autoloads (man-follow man) "man" "man.el" (17925 15265)) ++;;;### (autoloads (man-follow man) "man" "man.el" (17963 20867)) ;;; Generated autoloads from man.el (defalias (quote manual-entry) (quote man)) @@@ -17678,7 -17542,7 +17710,7 @@@ turn on menu bars; otherwise, turn off ;;;;;; message-cite-function message-yank-prefix message-citation-line-function ;;;;;; message-send-mail-function message-user-organization-file ;;;;;; message-signature-separator message-from-style) "message" - ;;;;;; "gnus/message.el" (17963 18449)) -;;;;;; "gnus/message.el" (17949 41467)) ++;;;;;; "gnus/message.el" (17963 20999)) ;;; Generated autoloads from gnus/message.el (defvar message-from-style (quote default) "\ @@@ -18976,7 -18842,7 +19010,7 @@@ Open a network connection to HOST on PO ;;;;;; uncomment-region comment-kill comment-set-column comment-indent ;;;;;; comment-indent-default comment-normalize-vars comment-multi-line ;;;;;; comment-padding comment-style comment-column) "newcomment" - ;;;;;; "newcomment.el" (17888 32280)) -;;;;;; "newcomment.el" (17936 9617)) ++;;;;;; "newcomment.el" (17963 21008)) ;;; Generated autoloads from newcomment.el (defalias (quote indent-for-comment) (quote comment-indent)) @@@ -19507,7 -19351,7 +19541,7 @@@ The Custom feature is intended to make ;;;;;; org-remember-handler org-remember org-remember-apply-template ;;;;;; org-remember-annotation org-store-link orgtbl-mode turn-on-orgtbl ;;;;;; org-global-cycle org-cycle org-mode) "org" "textmodes/org.el" - ;;;;;; (17963 19299)) -;;;;;; (17922 37459)) ++;;;;;; (17963 20865)) ;;; Generated autoloads from textmodes/org.el (autoload (quote org-mode) "org" "\ @@@ -21663,7 -21507,7 +21697,7 @@@ If EXTENSION is any other symbol, it i ;;;*** ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el" - ;;;;;; (17963 19313)) -;;;;;; (17956 9518)) ++;;;;;; (17963 20999)) ;;; Generated autoloads from progmodes/python.el (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode))) @@@ -22122,7 -21966,7 +22156,7 @@@ Construct a regexp interactively ;;;*** - ;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17888 32281)) -;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17930 34071)) ++;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17963 20999)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@@ -22295,7 -22139,7 +22329,7 @@@ refilling if they would cause auto-fill ;;;*** ;;;### (autoloads (reftex-reset-scanning-information reftex-mode - ;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (17888 32281)) -;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (17923 8784)) ++;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (17963 20865)) ;;; Generated autoloads from textmodes/reftex.el (autoload (quote turn-on-reftex) "reftex" "\ @@@ -22345,7 -22189,7 +22379,7 @@@ This enforces rescanning the buffer on ;;;*** ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el" - ;;;;;; (17888 32281)) -;;;;;; (17923 8784)) ++;;;;;; (17963 20865)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload (quote reftex-citation) "reftex-cite" "\ @@@ -22375,7 -22219,7 +22409,7 @@@ While entering the regexp, completion o ;;;*** ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el" - ;;;;;; (17888 32281)) -;;;;;; (17923 8784)) ++;;;;;; (17963 20865)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload (quote reftex-isearch-minor-mode) "reftex-global" "\ @@@ -22392,7 -22236,7 +22426,7 @@@ With no argument, this command toggle ;;;*** ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el" - ;;;;;; (17888 32281)) -;;;;;; (17923 8784)) ++;;;;;; (17963 20865)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload (quote reftex-index-phrases-mode) "reftex-index" "\ @@@ -22425,7 -22269,7 +22459,7 @@@ Here are all local bindings ;;;*** ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el" - ;;;;;; (17888 32281)) -;;;;;; (17923 8784)) ++;;;;;; (17963 20865)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload (quote reftex-all-document-files) "reftex-parse" "\ @@@ -22437,8 -22281,8 +22471,8 @@@ of master file ;;;*** - ;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (17888 - ;;;;;; 32281)) -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (17923 -;;;;;; 8784)) ++;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (17963 ++;;;;;; 20865)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@@ -22665,8 -22509,8 +22699,8 @@@ variable ;;;;;; rmail-mail-new-frame rmail-primary-inbox-list rmail-delete-after-output ;;;;;; rmail-highlight-face rmail-highlighted-headers rmail-retry-ignored-headers ;;;;;; rmail-displayed-headers rmail-ignored-headers rmail-dont-reply-to-names -;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17938 -;;;;;; 22875)) +;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17963 - ;;;;;; 18438)) ++;;;;;; 21010)) ;;; Generated autoloads from mail/rmail.el (autoload (quote rmail-movemail-variant-p) "rmail" "\ @@@ -24445,7 -24197,7 +24479,7 @@@ Turning on Sieve mode runs `sieve-mode- ;;;*** - ;;;### (autoloads nil "simple" "simple.el" (17963 19313)) -;;;### (autoloads nil "simple" "simple.el" (17949 41467)) ++;;;### (autoloads nil "simple" "simple.el" (17963 21011)) ;;; Generated autoloads from simple.el (put 'fill-prefix 'safe-local-variable 'string-or-null-p) @@@ -24648,7 -24400,7 +24682,7 @@@ interactively. If there's no argument, ;;;*** ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail" - ;;;;;; "mail/smtpmail.el" (17888 36928)) -;;;;;; "mail/smtpmail.el" (17939 50716)) ++;;;;;; "mail/smtpmail.el" (17963 21010)) ;;; Generated autoloads from mail/smtpmail.el (autoload (quote smtpmail-send-it) "smtpmail" "\ @@@ -25708,7 -25460,7 +25742,7 @@@ Studlify-case the current buffer ;;;*** - ;;;### (autoloads (locate-library) "subr" "subr.el" (17963 19313)) -;;;### (autoloads (locate-library) "subr" "subr.el" (17949 41467)) ++;;;### (autoloads (locate-library) "subr" "subr.el" (17963 21011)) ;;; Generated autoloads from subr.el (autoload (quote locate-library) "subr" "\ @@@ -25762,7 -25514,7 +25796,7 @@@ before, and `sc-post-hook' is run afte ;;;*** - ;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17963 19313)) -;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17938 61442)) ++;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17963 21011)) ;;; Generated autoloads from t-mouse.el (defvar t-mouse-mode nil "\ @@@ -26591,7 -26338,7 +26625,7 @@@ subprocess started ;;;*** ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el" - ;;;;;; (17888 32279)) -;;;;;; (17925 52793)) ++;;;;;; (17963 20867)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload (quote testcover-this-defun) "testcover" "\ @@@ -26601,7 -26348,7 +26635,7 @@@ Start coverage on function under point ;;;*** - ;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17963 18455)) -;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17941 38806)) ++;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17963 21010)) ;;; Generated autoloads from play/tetris.el (autoload (quote tetris) "tetris" "\ @@@ -27577,7 -27324,7 +27611,7 @@@ relative only to the time worked today ;;;### (autoloads (with-timeout run-with-idle-timer add-timeout run-with-timer ;;;;;; run-at-time cancel-function-timers cancel-timer) "timer" - ;;;;;; "emacs-lisp/timer.el" (17888 32279)) -;;;;;; "emacs-lisp/timer.el" (17935 13348)) ++;;;;;; "emacs-lisp/timer.el" (17963 21006)) ;;; Generated autoloads from emacs-lisp/timer.el (defalias (quote disable-timeout) (quote cancel-timer)) @@@ -27700,9 -27452,10 +27739,9 @@@ PATTERN regexp ;;;*** ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm" - ;;;;;; "tmm.el" (17888 32281)) -;;;;;; "tmm.el" (17952 58711)) ++;;;;;; "tmm.el" (17963 21011)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) - (define-key global-map [f10] 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) (autoload (quote tmm-menubar) "tmm" "\ @@@ -27972,7 -27719,7 +28011,7 @@@ BUFFER defaults to `trace-buffer' ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-completion-file-name-regexp - ;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17963 19047)) -;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17934 45069)) ++;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17963 21006)) ;;; Generated autoloads from net/tramp.el (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\ @@@ -28774,7 -28525,7 +28817,7 @@@ Not documente ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p - ;;;;;; url-http) "url-http" "url/url-http.el" (17888 36646)) -;;;;;; url-http) "url-http" "url/url-http.el" (17952 11683)) ++;;;;;; url-http) "url-http" "url/url-http.el" (17963 21008)) ;;; Generated autoloads from url/url-http.el (autoload (quote url-http) "url-http" "\ @@@ -29487,7 -29238,7 +29530,7 @@@ colors. `vc-annotate-background' specif ;;;*** - ;;;### (autoloads nil "vc-arch" "vc-arch.el" (17888 32281)) -;;;### (autoloads nil "vc-arch" "vc-arch.el" (17930 34221)) ++;;;### (autoloads nil "vc-arch" "vc-arch.el" (17963 20999)) ;;; Generated autoloads from vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@@ -29518,7 -29269,7 +29561,7 @@@ ;;;*** ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el" - ;;;;;; (17888 32281)) -;;;;;; (17925 15266)) ++;;;;;; (17963 20867)) ;;; Generated autoloads from vc-rcs.el (defvar vc-rcs-master-templates (quote ("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@@ -30208,8 -29959,8 +30251,8 @@@ Not documente ;;;### (autoloads (View-exit-and-edit view-mode-enter view-mode view-buffer-other-frame ;;;;;; view-buffer-other-window view-buffer view-file-other-frame - ;;;;;; view-file-other-window view-file) "view" "view.el" (17888 - ;;;;;; 32281)) -;;;;;; view-file-other-window view-file) "view" "view.el" (17930 -;;;;;; 34071)) ++;;;;;; view-file-other-window view-file) "view" "view.el" (17963 ++;;;;;; 20999)) ;;; Generated autoloads from view.el (defvar view-mode nil "\ @@@ -30435,7 -30186,7 +30478,7 @@@ Turn on VIP emulation of VI ;;;*** ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el" - ;;;;;; (17888 32279)) -;;;;;; (17921 23052)) ++;;;;;; (17963 20865)) ;;; Generated autoloads from emulation/viper.el (autoload (quote toggle-viper-mode) "viper" "\ @@@ -30452,7 -30203,7 +30495,7 @@@ Turn on Viper emulation of Vi in Emacs ;;;*** ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el" - ;;;;;; (17888 32279)) -;;;;;; (17935 13348)) ++;;;;;; (17963 21006)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@@ -30607,7 -30359,7 +30651,7 @@@ and off otherwise ;;;;;; whitespace-buffer whitespace-toggle-ateol-check whitespace-toggle-spacetab-check ;;;;;; whitespace-toggle-indent-check whitespace-toggle-trailing-check ;;;;;; whitespace-toggle-leading-check) "whitespace" "whitespace.el" - ;;;;;; (17888 32281)) -;;;;;; (17925 15266)) ++;;;;;; (17963 20867)) ;;; Generated autoloads from whitespace.el (autoload (quote whitespace-toggle-leading-check) "whitespace" "\ @@@ -30843,7 -30595,7 +30887,7 @@@ With arg, turn Winner mode on if and on ;;;*** ;;;### (autoloads (woman-find-file woman-dired-find-file woman) "woman" - ;;;;;; "woman.el" (17963 19299)) -;;;;;; "woman.el" (17949 41467)) ++;;;;;; "woman.el" (17963 21006)) ;;; Generated autoloads from woman.el (autoload (quote woman) "woman" "\ @@@ -31017,8 -30769,8 +31061,8 @@@ If PARSE-NS is non-nil, then QNAMES ar ;;;*** - ;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17888 - ;;;;;; 32281)) -;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17938 -;;;;;; 61442)) ++;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17963 ++;;;;;; 21011)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@@ -31088,7 -30840,7 +31132,7 @@@ Zippy goes to the analyst ;;;*** - ;;;### (autoloads (zone) "zone" "play/zone.el" (17888 32281)) -;;;### (autoloads (zone) "zone" "play/zone.el" (17941 38806)) ++;;;### (autoloads (zone) "zone" "play/zone.el" (17963 21010)) ;;; Generated autoloads from play/zone.el (autoload (quote zone) "zone" "\ @@@ -31228,7 -30980,7 +31272,7 @@@ Zone out, completely ;;;;;; "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el" ;;;;;; "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el" ;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el" - ;;;;;; "x-dnd.el") (17963 20717 345010)) -;;;;;; "x-dnd.el") (17956 9728 35408)) ++;;;;;; "x-dnd.el") (17963 21179 886390)) ;;;*** diff --cc lisp/term/xterm.el index 9ac820dda72,297ee7df5cd..f601976cd63 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@@ -27,284 -27,6 +27,301 @@@ ;;; Code: +(defvar xterm-function-map (make-sparse-keymap) + "Function key map overrides for xterm.") + +;; xterm from X.org 6.8.2 uses these key definitions. +(define-key xterm-function-map "\eOP" [f1]) +(define-key xterm-function-map "\eOQ" [f2]) +(define-key xterm-function-map "\eOR" [f3]) +(define-key xterm-function-map "\eOS" [f4]) +(define-key xterm-function-map "\e[15~" [f5]) +(define-key xterm-function-map "\e[17~" [f6]) +(define-key xterm-function-map "\e[18~" [f7]) +(define-key xterm-function-map "\e[19~" [f8]) +(define-key xterm-function-map "\e[20~" [f9]) +(define-key xterm-function-map "\e[21~" [f10]) +(define-key xterm-function-map "\e[23~" [f11]) +(define-key xterm-function-map "\e[24~" [f12]) + +(define-key xterm-function-map "\eO2P" [S-f1]) +(define-key xterm-function-map "\eO2Q" [S-f2]) +(define-key xterm-function-map "\eO2R" [S-f3]) +(define-key xterm-function-map "\eO2S" [S-f4]) +(define-key xterm-function-map "\e[1;2P" [S-f1]) +(define-key xterm-function-map "\e[1;2Q" [S-f2]) +(define-key xterm-function-map "\e[1;2R" [S-f3]) +(define-key xterm-function-map "\e[1;2S" [S-f4]) +(define-key xterm-function-map "\e[15;2~" [S-f5]) +(define-key xterm-function-map "\e[17;2~" [S-f6]) +(define-key xterm-function-map "\e[18;2~" [S-f7]) +(define-key xterm-function-map "\e[19;2~" [S-f8]) +(define-key xterm-function-map "\e[20;2~" [S-f9]) +(define-key xterm-function-map "\e[21;2~" [S-f10]) +(define-key xterm-function-map "\e[23;2~" [S-f11]) +(define-key xterm-function-map "\e[24;2~" [S-f12]) + +(define-key xterm-function-map "\eO5P" [C-f1]) +(define-key xterm-function-map "\eO5Q" [C-f2]) +(define-key xterm-function-map "\eO5R" [C-f3]) +(define-key xterm-function-map "\eO5S" [C-f4]) +(define-key xterm-function-map "\e[15;5~" [C-f5]) +(define-key xterm-function-map "\e[17;5~" [C-f6]) +(define-key xterm-function-map "\e[18;5~" [C-f7]) +(define-key xterm-function-map "\e[19;5~" [C-f8]) +(define-key xterm-function-map "\e[20;5~" [C-f9]) +(define-key xterm-function-map "\e[21;5~" [C-f10]) +(define-key xterm-function-map "\e[23;5~" [C-f11]) +(define-key xterm-function-map "\e[24;5~" [C-f12]) + +(define-key xterm-function-map "\eO6P" [C-S-f1]) +(define-key xterm-function-map "\eO6Q" [C-S-f2]) +(define-key xterm-function-map "\eO6R" [C-S-f3]) +(define-key xterm-function-map "\eO6S" [C-S-f4]) +(define-key xterm-function-map "\e[15;6~" [C-S-f5]) +(define-key xterm-function-map "\e[17;6~" [C-S-f6]) +(define-key xterm-function-map "\e[18;6~" [C-S-f7]) +(define-key xterm-function-map "\e[19;6~" [C-S-f8]) +(define-key xterm-function-map "\e[20;6~" [C-S-f9]) +(define-key xterm-function-map "\e[21;6~" [C-S-f10]) +(define-key xterm-function-map "\e[23;6~" [C-S-f11]) +(define-key xterm-function-map "\e[24;6~" [C-S-f12]) + +(define-key xterm-function-map "\eO3P" [A-f1]) +(define-key xterm-function-map "\eO3Q" [A-f2]) +(define-key xterm-function-map "\eO3R" [A-f3]) +(define-key xterm-function-map "\eO3S" [A-f4]) +(define-key xterm-function-map "\e[15;3~" [A-f5]) +(define-key xterm-function-map "\e[17;3~" [A-f6]) +(define-key xterm-function-map "\e[18;3~" [A-f7]) +(define-key xterm-function-map "\e[19;3~" [A-f8]) +(define-key xterm-function-map "\e[20;3~" [A-f9]) +(define-key xterm-function-map "\e[21;3~" [A-f10]) +(define-key xterm-function-map "\e[23;3~" [A-f11]) +(define-key xterm-function-map "\e[24;3~" [A-f12]) + +(define-key xterm-function-map "\eOA" [up]) +(define-key xterm-function-map "\eOB" [down]) +(define-key xterm-function-map "\eOC" [right]) +(define-key xterm-function-map "\eOD" [left]) +(define-key xterm-function-map "\eOF" [end]) +(define-key xterm-function-map "\eOH" [home]) + +(define-key xterm-function-map "\e[1;2A" [S-up]) +(define-key xterm-function-map "\e[1;2B" [S-down]) +(define-key xterm-function-map "\e[1;2C" [S-right]) +(define-key xterm-function-map "\e[1;2D" [S-left]) +(define-key xterm-function-map "\e[1;2F" [S-end]) +(define-key xterm-function-map "\e[1;2H" [S-home]) + +(define-key xterm-function-map "\e[1;5A" [C-up]) +(define-key xterm-function-map "\e[1;5B" [C-down]) +(define-key xterm-function-map "\e[1;5C" [C-right]) +(define-key xterm-function-map "\e[1;5D" [C-left]) +(define-key xterm-function-map "\e[1;5F" [C-end]) +(define-key xterm-function-map "\e[1;5H" [C-home]) + +(define-key xterm-function-map "\e[1;6A" [C-S-up]) +(define-key xterm-function-map "\e[1;6B" [C-S-down]) +(define-key xterm-function-map "\e[1;6C" [C-S-right]) +(define-key xterm-function-map "\e[1;6D" [C-S-left]) +(define-key xterm-function-map "\e[1;6F" [C-S-end]) +(define-key xterm-function-map "\e[1;6H" [C-S-home]) + +(define-key xterm-function-map "\e[1;3A" [A-up]) +(define-key xterm-function-map "\e[1;3B" [A-down]) +(define-key xterm-function-map "\e[1;3C" [A-right]) +(define-key xterm-function-map "\e[1;3D" [A-left]) +(define-key xterm-function-map "\e[1;3F" [A-end]) +(define-key xterm-function-map "\e[1;3H" [A-home]) + +(define-key xterm-function-map "\e[2~" [insert]) +(define-key xterm-function-map "\e[3~" [delete]) +(define-key xterm-function-map "\e[5~" [prior]) +(define-key xterm-function-map "\e[6~" [next]) + +(define-key xterm-function-map "\e[2;2~" [S-insert]) +(define-key xterm-function-map "\e[3;2~" [S-delete]) +(define-key xterm-function-map "\e[5;2~" [S-prior]) +(define-key xterm-function-map "\e[6;2~" [S-next]) + +(define-key xterm-function-map "\e[2;5~" [C-insert]) +(define-key xterm-function-map "\e[3;5~" [C-delete]) +(define-key xterm-function-map "\e[5;5~" [C-prior]) +(define-key xterm-function-map "\e[6;5~" [C-next]) + +(define-key xterm-function-map "\e[2;6~" [C-S-insert]) +(define-key xterm-function-map "\e[3;6~" [C-S-delete]) +(define-key xterm-function-map "\e[5;6~" [C-S-prior]) +(define-key xterm-function-map "\e[6;6~" [C-S-next]) + +(define-key xterm-function-map "\e[2;3~" [A-insert]) +(define-key xterm-function-map "\e[3;3~" [A-delete]) +(define-key xterm-function-map "\e[5;3~" [A-prior]) +(define-key xterm-function-map "\e[6;3~" [A-next]) + +(define-key xterm-function-map "\e[4~" [select]) +(define-key xterm-function-map "\e[29~" [print]) + ++(define-key xterm-function-map "\eOj" [kp-multiply]) ++(define-key xterm-function-map "\eOk" [kp-add]) ++(define-key xterm-function-map "\eOl" [kp-separator]) ++(define-key xterm-function-map "\eOm" [kp-subtract]) ++(define-key xterm-function-map "\eOo" [kp-divide]) ++(define-key xterm-function-map "\eOp" [kp-0]) ++(define-key xterm-function-map "\eOq" [kp-1]) ++(define-key xterm-function-map "\eOr" [kp-2]) ++(define-key xterm-function-map "\eOs" [kp-3]) ++(define-key xterm-function-map "\eOt" [kp-4]) ++(define-key xterm-function-map "\eOu" [kp-5]) ++(define-key xterm-function-map "\eOv" [kp-6]) ++(define-key xterm-function-map "\eOw" [kp-7]) ++(define-key xterm-function-map "\eOx" [kp-8]) ++(define-key xterm-function-map "\eOy" [kp-9]) ++ +;; These keys are available in xterm starting from version 216 +;; if the modifyOtherKeys resource is set to 1. + +(define-key xterm-function-map "\e[27;5;9~" [C-tab]) +(define-key xterm-function-map "\e[27;5;13~" [C-return]) +(define-key xterm-function-map "\e[27;5;39~" [?\C-\']) +(define-key xterm-function-map "\e[27;5;44~" [?\C-,]) +(define-key xterm-function-map "\e[27;5;45~" [?\C--]) +(define-key xterm-function-map "\e[27;5;46~" [?\C-.]) +(define-key xterm-function-map "\e[27;5;47~" [?\C-/]) +(define-key xterm-function-map "\e[27;5;48~" [?\C-0]) +(define-key xterm-function-map "\e[27;5;49~" [?\C-1]) +;; Not all C-DIGIT keys have a distinct binding. +(define-key xterm-function-map "\e[27;5;57~" [?\C-9]) - (define-key xterm-function-map "\e[27;5;59~" [(C-\;)]) ++(define-key xterm-function-map "\e[27;5;59~" [?\C-\;]) +(define-key xterm-function-map "\e[27;5;61~" [?\C-=]) +(define-key xterm-function-map "\e[27;5;92~" [?\C-\\]) + +(define-key xterm-function-map "\e[27;6;33~" [?\C-!]) +(define-key xterm-function-map "\e[27;6;34~" [?\C-\"]) +(define-key xterm-function-map "\e[27;6;35~" [?\C-#]) +(define-key xterm-function-map "\e[27;6;36~" [?\C-$]) +(define-key xterm-function-map "\e[27;6;37~" [?\C-%]) - (define-key xterm-function-map "\e[27;6;38~" [(C-&)]) ++(define-key xterm-function-map "\e[27;6;38~" [?\C-&]) +(define-key xterm-function-map "\e[27;6;40~" [?\C-(]) +(define-key xterm-function-map "\e[27;6;41~" [?\C-)]) +(define-key xterm-function-map "\e[27;6;42~" [?\C-*]) +(define-key xterm-function-map "\e[27;6;43~" [?\C-+]) +(define-key xterm-function-map "\e[27;6;58~" [?\C-:]) +(define-key xterm-function-map "\e[27;6;60~" [?\C-<]) +(define-key xterm-function-map "\e[27;6;62~" [?\C->]) - (define-key xterm-function-map "\e[27;6;63~" [(C-\?)]) ++(define-key xterm-function-map "\e[27;6;63~" [(control ??)]) + +;; These are the strings emitted for various C-M- combinations +;; for keyboards that the Meta and Alt modifiers are on the same +;; key (usually labeled "Alt"). - (define-key xterm-function-map "\e[27;13;9~" [(C-M-tab)]) - (define-key xterm-function-map "\e[27;13;13~" [(C-M-return)]) ++(define-key xterm-function-map "\e[27;13;9~" [C-M-tab]) ++(define-key xterm-function-map "\e[27;13;13~" [C-M-return]) + +(define-key xterm-function-map "\e[27;13;39~" [?\C-\M-\']) +(define-key xterm-function-map "\e[27;13;44~" [?\C-\M-,]) +(define-key xterm-function-map "\e[27;13;45~" [?\C-\M--]) +(define-key xterm-function-map "\e[27;13;46~" [?\C-\M-.]) +(define-key xterm-function-map "\e[27;13;47~" [?\C-\M-/]) +(define-key xterm-function-map "\e[27;13;48~" [?\C-\M-0]) +(define-key xterm-function-map "\e[27;13;49~" [?\C-\M-1]) +(define-key xterm-function-map "\e[27;13;50~" [?\C-\M-2]) +(define-key xterm-function-map "\e[27;13;51~" [?\C-\M-3]) +(define-key xterm-function-map "\e[27;13;52~" [?\C-\M-4]) +(define-key xterm-function-map "\e[27;13;53~" [?\C-\M-5]) +(define-key xterm-function-map "\e[27;13;54~" [?\C-\M-6]) +(define-key xterm-function-map "\e[27;13;55~" [?\C-\M-7]) +(define-key xterm-function-map "\e[27;13;56~" [?\C-\M-8]) +(define-key xterm-function-map "\e[27;13;57~" [?\C-\M-9]) +(define-key xterm-function-map "\e[27;13;59~" [?\C-\M-\;]) +(define-key xterm-function-map "\e[27;13;61~" [?\C-\M-=]) +(define-key xterm-function-map "\e[27;13;92~" [?\C-\M-\\]) + +(define-key xterm-function-map "\e[27;14;33~" [?\C-\M-!]) +(define-key xterm-function-map "\e[27;14;34~" [?\C-\M-\"]) +(define-key xterm-function-map "\e[27;14;35~" [?\C-\M-#]) +(define-key xterm-function-map "\e[27;14;36~" [?\C-\M-$]) +(define-key xterm-function-map "\e[27;14;37~" [?\C-\M-%]) - (define-key xterm-function-map "\e[27;14;38~" [(C-M-&)]) ++(define-key xterm-function-map "\e[27;14;38~" [?\C-\M-&]) +(define-key xterm-function-map "\e[27;14;40~" [?\C-\M-(]) +(define-key xterm-function-map "\e[27;14;41~" [?\C-\M-)]) +(define-key xterm-function-map "\e[27;14;42~" [?\C-\M-*]) +(define-key xterm-function-map "\e[27;14;43~" [?\C-\M-+]) +(define-key xterm-function-map "\e[27;14;58~" [?\C-\M-:]) +(define-key xterm-function-map "\e[27;14;60~" [?\C-\M-<]) +(define-key xterm-function-map "\e[27;14;62~" [?\C-\M->]) - (define-key xterm-function-map "\e[27;14;63~" [(C-M-\?)]) ++(define-key xterm-function-map "\e[27;14;63~" [(control meta ??)]) + - (define-key xterm-function-map "\e[27;7;9~" [(C-M-tab)]) - (define-key xterm-function-map "\e[27;7;13~" [(C-M-return)]) ++(define-key xterm-function-map "\e[27;7;9~" [C-M-tab]) ++(define-key xterm-function-map "\e[27;7;13~" [C-M-return]) + ++(define-key xterm-function-map "\e[27;7;32~" [?\C-\M-\s]) +(define-key xterm-function-map "\e[27;7;39~" [?\C-\M-\']) +(define-key xterm-function-map "\e[27;7;44~" [?\C-\M-,]) +(define-key xterm-function-map "\e[27;7;45~" [?\C-\M--]) +(define-key xterm-function-map "\e[27;7;46~" [?\C-\M-.]) +(define-key xterm-function-map "\e[27;7;47~" [?\C-\M-/]) +(define-key xterm-function-map "\e[27;7;48~" [?\C-\M-0]) +(define-key xterm-function-map "\e[27;7;49~" [?\C-\M-1]) +(define-key xterm-function-map "\e[27;7;50~" [?\C-\M-2]) +(define-key xterm-function-map "\e[27;7;51~" [?\C-\M-3]) +(define-key xterm-function-map "\e[27;7;52~" [?\C-\M-4]) +(define-key xterm-function-map "\e[27;7;53~" [?\C-\M-5]) +(define-key xterm-function-map "\e[27;7;54~" [?\C-\M-6]) +(define-key xterm-function-map "\e[27;7;55~" [?\C-\M-7]) +(define-key xterm-function-map "\e[27;7;56~" [?\C-\M-8]) +(define-key xterm-function-map "\e[27;7;57~" [?\C-\M-9]) +(define-key xterm-function-map "\e[27;7;59~" [?\C-\M-\;]) +(define-key xterm-function-map "\e[27;7;61~" [?\C-\M-=]) +(define-key xterm-function-map "\e[27;7;92~" [?\C-\M-\\]) + +(define-key xterm-function-map "\e[27;8;33~" [?\C-\M-!]) +(define-key xterm-function-map "\e[27;8;34~" [?\C-\M-\"]) +(define-key xterm-function-map "\e[27;8;35~" [?\C-\M-#]) +(define-key xterm-function-map "\e[27;8;36~" [?\C-\M-$]) +(define-key xterm-function-map "\e[27;8;37~" [?\C-\M-%]) - (define-key xterm-function-map "\e[27;8;38~" [(C-M-&)]) ++(define-key xterm-function-map "\e[27;8;38~" [?\C-\M-&]) +(define-key xterm-function-map "\e[27;8;40~" [?\C-\M-(]) +(define-key xterm-function-map "\e[27;8;41~" [?\C-\M-)]) +(define-key xterm-function-map "\e[27;8;42~" [?\C-\M-*]) +(define-key xterm-function-map "\e[27;8;43~" [?\C-\M-+]) +(define-key xterm-function-map "\e[27;8;58~" [?\C-\M-:]) +(define-key xterm-function-map "\e[27;8;60~" [?\C-\M-<]) +(define-key xterm-function-map "\e[27;8;62~" [?\C-\M->]) - (define-key xterm-function-map "\e[27;8;63~" [(C-M-\?)]) ++(define-key xterm-function-map "\e[27;8;63~" [(control meta ??)]) + +(define-key xterm-function-map "\e[27;2;9~" [S-tab]) +(define-key xterm-function-map "\e[27;2;13~" [S-return]) + - (define-key xterm-function-map "\e[27;6;9~" [(C-S-tab)]) - (define-key xterm-function-map "\e[27;6;13~" [(C-S-return)]) ++(define-key xterm-function-map "\e[27;6;9~" [C-S-tab]) ++(define-key xterm-function-map "\e[27;6;13~" [C-S-return]) + +;; Other versions of xterm might emit these. +(define-key xterm-function-map "\e[A" [up]) +(define-key xterm-function-map "\e[B" [down]) +(define-key xterm-function-map "\e[C" [right]) +(define-key xterm-function-map "\e[D" [left]) +(define-key xterm-function-map "\e[1~" [home]) + +(define-key xterm-function-map "\e[1;2A" [S-up]) +(define-key xterm-function-map "\e[1;2B" [S-down]) +(define-key xterm-function-map "\e[1;2C" [S-right]) +(define-key xterm-function-map "\e[1;2D" [S-left]) +(define-key xterm-function-map "\e[1;2F" [S-end]) +(define-key xterm-function-map "\e[1;2H" [S-home]) + +(define-key xterm-function-map "\e[1;5A" [C-up]) +(define-key xterm-function-map "\e[1;5B" [C-down]) +(define-key xterm-function-map "\e[1;5C" [C-right]) +(define-key xterm-function-map "\e[1;5D" [C-left]) +(define-key xterm-function-map "\e[1;5F" [C-end]) +(define-key xterm-function-map "\e[1;5H" [C-home]) + +(define-key xterm-function-map "\e[11~" [f1]) +(define-key xterm-function-map "\e[12~" [f2]) +(define-key xterm-function-map "\e[13~" [f3]) +(define-key xterm-function-map "\e[14~" [f4]) + (defun terminal-init-xterm () "Terminal initialization function for xterm." ;; rxvt terminals sometimes set the TERM variable to "xterm", but diff --cc lisp/xt-mouse.el index 899049cef03,8ae79903d51..ede5f1359f7 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el @@@ -100,14 -100,14 +101,16 @@@ (vector (list down-where down-data) down) (vector down)))))))) -(defvar xterm-mouse-x 0 - "Position of last xterm mouse event relative to the frame.") - -(defvar xterm-mouse-y 0 - "Position of last xterm mouse event relative to the frame.") +;; These two variables have been converted to terminal parameters. +;; +;;(defvar xterm-mouse-x 0 +;; "Position of last xterm mouse event relative to the frame.") +;; +;;(defvar xterm-mouse-y 0 +;; "Position of last xterm mouse event relative to the frame.") + (defvar xt-mouse-epoch nil) + ;; Indicator for the xterm-mouse mode. (defun xterm-mouse-position-function (pos) @@@ -146,14 -156,17 +161,17 @@@ (left (nth 0 ltrb)) (top (nth 1 ltrb))) - (setq xterm-mouse-x x - xterm-mouse-y y) + (set-terminal-parameter nil 'xterm-mouse-x x) + (set-terminal-parameter nil 'xterm-mouse-y y) (setq last-input-event - (if w - (list mouse (posn-at-x-y (- x left) (- y top) w t)) - (list mouse - (append (list nil 'menu-bar) (nthcdr 2 (posn-at-x-y x y w t)))))))) + (list mouse + (let ((event (if w + (posn-at-x-y (- x left) (- y top) w t) + (append (list nil 'menu-bar) + (nthcdr 2 (posn-at-x-y x y)))))) + (setcar (nthcdr 3 event) timestamp) + event))))) ;;;###autoload (define-minor-mode xterm-mouse-mode