diff options
73 files changed, 420 insertions, 420 deletions
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 647a7b8abae..49ca67fe5de 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 | |||
| @@ -1194,7 +1194,7 @@ | |||
| 1194 | 1194 | ||
| 1195 | * winnt.el (using-unix-filesystems): Update doc string. | 1195 | * winnt.el (using-unix-filesystems): Update doc string. |
| 1196 | 1196 | ||
| 1197 | 1996-05-11 Andrew Innes <andrewi@harlequin.co.uk> | 1197 | 1996-05-11 Andrew Innes <andrewi@harlequin.co.uk> |
| 1198 | 1198 | ||
| 1199 | * scroll-bar.el (scroll-bar-drag-position): New function. | 1199 | * scroll-bar.el (scroll-bar-drag-position): New function. |
| 1200 | (scroll-bar-maybe-set-window-start): New function. | 1200 | (scroll-bar-maybe-set-window-start): New function. |
| @@ -1313,7 +1313,7 @@ | |||
| 1313 | * apropos.el (apropos-print): If command has no key bindings, | 1313 | * apropos.el (apropos-print): If command has no key bindings, |
| 1314 | say how to run it with M-x. | 1314 | say how to run it with M-x. |
| 1315 | 1315 | ||
| 1316 | 1996-05-03 Andrew Innes <andrewi@harlequin.co.uk> | 1316 | 1996-05-03 Andrew Innes <andrewi@harlequin.co.uk> |
| 1317 | 1317 | ||
| 1318 | * winnt.el (original-make-auto-save-file-name): New symbol bound | 1318 | * winnt.el (original-make-auto-save-file-name): New symbol bound |
| 1319 | to old value of make-auto-save-file-name. | 1319 | to old value of make-auto-save-file-name. |
| @@ -1364,7 +1364,7 @@ | |||
| 1364 | * solar.el (diary-sabbath-candles): Don't correct for DST a second | 1364 | * solar.el (diary-sabbath-candles): Don't correct for DST a second |
| 1365 | time. | 1365 | time. |
| 1366 | 1366 | ||
| 1367 | 1996-04-26 Andrew Innes <andrewi@harlequin.co.uk> | 1367 | 1996-04-26 Andrew Innes <andrewi@harlequin.co.uk> |
| 1368 | 1368 | ||
| 1369 | * compile.el (compilation-error-regexp-alist): Add regexp | 1369 | * compile.el (compilation-error-regexp-alist): Add regexp |
| 1370 | for Microsoft VC++ error messages containing drive letters. | 1370 | for Microsoft VC++ error messages containing drive letters. |
| @@ -1466,7 +1466,7 @@ | |||
| 1466 | * metamail.el: Optional argument which value is passed to the | 1466 | * metamail.el: Optional argument which value is passed to the |
| 1467 | environment variable EMACS_VIEW_MODE is added to the function | 1467 | environment variable EMACS_VIEW_MODE is added to the function |
| 1468 | metamail-buffer and metamail-region. | 1468 | metamail-buffer and metamail-region. |
| 1469 | 1469 | ||
| 1470 | * files.el (after-find-file): Mention file name in | 1470 | * files.el (after-find-file): Mention file name in |
| 1471 | "auto save is newer" message. | 1471 | "auto save is newer" message. |
| 1472 | 1472 | ||
| @@ -1495,7 +1495,7 @@ | |||
| 1495 | (vc-clear-context): Initialise vc-comment-ring using make-ring. | 1495 | (vc-clear-context): Initialise vc-comment-ring using make-ring. |
| 1496 | (vc-finish-logentry): Don't initialise vc-comment-ring here. | 1496 | (vc-finish-logentry): Don't initialise vc-comment-ring here. |
| 1497 | 1497 | ||
| 1498 | 1996-04-15 Eric Ding <ericding@mit.edu> | 1498 | 1996-04-15 Eric Ding <ericding@mit.edu> |
| 1499 | 1499 | ||
| 1500 | * goto-addr.el (goto-address-send-using-mh-e): | 1500 | * goto-addr.el (goto-address-send-using-mh-e): |
| 1501 | Renamed from goto-address-send-using-mhe. Require `mh-comp'. | 1501 | Renamed from goto-address-send-using-mhe. Require `mh-comp'. |
| @@ -2862,7 +2862,7 @@ | |||
| 2862 | (timer-inc-time): Use timer-relative-time. | 2862 | (timer-inc-time): Use timer-relative-time. |
| 2863 | (timer-set-time, timer-set-time-with-usecs): Allow floating DELTA. | 2863 | (timer-set-time, timer-set-time-with-usecs): Allow floating DELTA. |
| 2864 | 2864 | ||
| 2865 | 1996-01-31 Caleb Deupree <cdeupree@cincom.com> | 2865 | 1996-01-31 Caleb Deupree <cdeupree@cincom.com> |
| 2866 | 2866 | ||
| 2867 | * winnt.el (mode-line-format): Include column-number-mode. | 2867 | * winnt.el (mode-line-format): Include column-number-mode. |
| 2868 | 2868 | ||
| @@ -3393,7 +3393,7 @@ | |||
| 3393 | 3393 | ||
| 3394 | * files.el (auto-mode-alist): Use "\\`" instead of "^". | 3394 | * files.el (auto-mode-alist): Use "\\`" instead of "^". |
| 3395 | 3395 | ||
| 3396 | 1996-01-17 Michael Staats <michael@thp.Uni-Duisburg.DE> | 3396 | 1996-01-17 Michael Staats <michael@thp.Uni-Duisburg.DE> |
| 3397 | 3397 | ||
| 3398 | * pc-select.el: Add some keybindings. | 3398 | * pc-select.el: Add some keybindings. |
| 3399 | (next-line-mark, next-line-nomark): Set this-command. | 3399 | (next-line-mark, next-line-nomark): Set this-command. |
| @@ -4257,7 +4257,7 @@ | |||
| 4257 | Look for an end-delimiter in case where the start-of-bounce | 4257 | Look for an end-delimiter in case where the start-of-bounce |
| 4258 | delimiter looks like -- plus some more text. | 4258 | delimiter looks like -- plus some more text. |
| 4259 | 4259 | ||
| 4260 | 1995-12-13 Kevin Rodgers <kevinr@ihs.com> | 4260 | 1995-12-13 Kevin Rodgers <kevinr@ihs.com> |
| 4261 | 4261 | ||
| 4262 | * ange-ftp.el (ange-ftp-load): Added missing form to `cdr' down | 4262 | * ange-ftp.el (ange-ftp-load): Added missing form to `cdr' down |
| 4263 | tryfiles in `while' loop. | 4263 | tryfiles in `while' loop. |
| @@ -4275,7 +4275,7 @@ | |||
| 4275 | 4275 | ||
| 4276 | * rmail.el (rmail-search): Doc fix. | 4276 | * rmail.el (rmail-search): Doc fix. |
| 4277 | 4277 | ||
| 4278 | 1995-12-11 Ake Stenhoff <etxaksf@aom.ericsson.se> | 4278 | 1995-12-11 Ake Stenhoff <etxaksf@aom.ericsson.se> |
| 4279 | 4279 | ||
| 4280 | * cc-mode.el (cc-imenu-c++-generic-expression): New variable. | 4280 | * cc-mode.el (cc-imenu-c++-generic-expression): New variable. |
| 4281 | (cc-imenu-c-generic-expression): New variable. | 4281 | (cc-imenu-c-generic-expression): New variable. |
| @@ -4349,12 +4349,12 @@ | |||
| 4349 | (isearch-repeat): If isearch-just-started, don't test for empty match. | 4349 | (isearch-repeat): If isearch-just-started, don't test for empty match. |
| 4350 | (isearch-unread): Use store-kbd-macro-event. | 4350 | (isearch-unread): Use store-kbd-macro-event. |
| 4351 | 4351 | ||
| 4352 | 1995-12-01 Francesco Potorti` <pot@cnuce.cnr.it> | 4352 | 1995-12-01 Francesco Potorti` <pot@cnuce.cnr.it> |
| 4353 | 4353 | ||
| 4354 | * gud.el (gud-sdb-marker-filter): Modify the regexp for sysVR3 to | 4354 | * gud.el (gud-sdb-marker-filter): Modify the regexp for sysVR3 to |
| 4355 | take care of the asterisk prompt. Correctly set gud-marker-acc. | 4355 | take care of the asterisk prompt. Correctly set gud-marker-acc. |
| 4356 | 4356 | ||
| 4357 | 1995-12-01 Francesco Potorti` <pot@cnuce.cnr.it> | 4357 | 1995-12-01 Francesco Potorti` <pot@cnuce.cnr.it> |
| 4358 | 4358 | ||
| 4359 | * make-mode.el: Add faces to menu only if window-system. | 4359 | * make-mode.el: Add faces to menu only if window-system. |
| 4360 | (makefile-mode): Do not check if makefile-define-space-face is | 4360 | (makefile-mode): Do not check if makefile-define-space-face is |
| @@ -4696,7 +4696,7 @@ | |||
| 4696 | * disp-table.el (display-table-slot,set-display-table-slot): | 4696 | * disp-table.el (display-table-slot,set-display-table-slot): |
| 4697 | Document the slot names. | 4697 | Document the slot names. |
| 4698 | 4698 | ||
| 4699 | 1995-12-01 Francesco Potorti` <pot@cnuce.cnr.it> | 4699 | 1995-12-01 Francesco Potorti` <pot@cnuce.cnr.it> |
| 4700 | 4700 | ||
| 4701 | * gud.el (gud-sdb-marker-filter): start may be nil, so check it | 4701 | * gud.el (gud-sdb-marker-filter): start may be nil, so check it |
| 4702 | with numberp before using it. | 4702 | with numberp before using it. |
| @@ -5102,7 +5102,7 @@ | |||
| 5102 | 5102 | ||
| 5103 | * view.el (View-scroll-lines-forward): Don't recenter at end. | 5103 | * view.el (View-scroll-lines-forward): Don't recenter at end. |
| 5104 | 5104 | ||
| 5105 | 1995-11-10 Kevin Rodgers <kevinr@ihs.com> | 5105 | 1995-11-10 Kevin Rodgers <kevinr@ihs.com> |
| 5106 | 5106 | ||
| 5107 | * files.el (find-file-noselect): Respect the value of | 5107 | * files.el (find-file-noselect): Respect the value of |
| 5108 | find-file-visit-truename when FILENAME is a directory and | 5108 | find-file-visit-truename when FILENAME is a directory and |
| @@ -5277,7 +5277,7 @@ | |||
| 5277 | 5277 | ||
| 5278 | * view.el (view-mode-map): Use ordinary Help command. | 5278 | * view.el (view-mode-map): Use ordinary Help command. |
| 5279 | 5279 | ||
| 5280 | 1995-11-02 Daniel Pfeiffer <Daniel.Pfeiffer@Informatik.START.dbp.de> | 5280 | 1995-11-02 Daniel Pfeiffer <Daniel.Pfeiffer@Informatik.START.dbp.de> |
| 5281 | 5281 | ||
| 5282 | * sh-script.el (sh-shells): Eliminated variable redundant with | 5282 | * sh-script.el (sh-shells): Eliminated variable redundant with |
| 5283 | `interpreter-mode-alist'. | 5283 | `interpreter-mode-alist'. |
| @@ -5308,7 +5308,7 @@ | |||
| 5308 | Renamed from shrink-window-horizontally, enlarge-window-horizontally | 5308 | Renamed from shrink-window-horizontally, enlarge-window-horizontally |
| 5309 | to avoid redefining the standard functions. | 5309 | to avoid redefining the standard functions. |
| 5310 | 5310 | ||
| 5311 | 1995-11-02 Stephen Gildea <gildea@stop.mail-abuse.org> | 5311 | 1995-11-02 Stephen Gildea <gildea@stop.mail-abuse.org> |
| 5312 | 5312 | ||
| 5313 | * mh-e.el (mh-make-folder-mode-line): support mh-msg-count. | 5313 | * mh-e.el (mh-make-folder-mode-line): support mh-msg-count. |
| 5314 | (mh-delete-scan-msgs): use fast new mh-goto-msg. | 5314 | (mh-delete-scan-msgs): use fast new mh-goto-msg. |
| @@ -5700,13 +5700,13 @@ | |||
| 5700 | 5700 | ||
| 5701 | * hippie-exp.el (he-transfer-case): Fix typo in prev change. | 5701 | * hippie-exp.el (he-transfer-case): Fix typo in prev change. |
| 5702 | 5702 | ||
| 5703 | 1995-10-13 Michael Kifer <Michael Kifer <kifer@cs.sunysb.edu>> | 5703 | 1995-10-13 Michael Kifer <Michael Kifer <kifer@cs.sunysb.edu>> |
| 5704 | 5704 | ||
| 5705 | * ediff.el (ediff-version): is now autoloaded. | 5705 | * ediff.el (ediff-version): is now autoloaded. |
| 5706 | * ediff-init.el: Moved defsubsts up. | 5706 | * ediff-init.el: Moved defsubsts up. |
| 5707 | * ediff-hook.el: Now defines [window] in menu-bar-ediff-menu. | 5707 | * ediff-hook.el: Now defines [window] in menu-bar-ediff-menu. |
| 5708 | 5708 | ||
| 5709 | 1995-10-13 Michael Kifer <Michael Kifer <kifer@cs.sunysb.edu>> | 5709 | 1995-10-13 Michael Kifer <Michael Kifer <kifer@cs.sunysb.edu>> |
| 5710 | 5710 | ||
| 5711 | * viper.el (vip-set-hooks): Use view-mode-hook in emacs and view | 5711 | * viper.el (vip-set-hooks): Use view-mode-hook in emacs and view |
| 5712 | hook in xemacs. | 5712 | hook in xemacs. |
| @@ -6050,7 +6050,7 @@ | |||
| 6050 | * edt.el (edt-setup-default-bindings): Revert function is | 6050 | * edt.el (edt-setup-default-bindings): Revert function is |
| 6051 | revert-buffer, not revert-file. | 6051 | revert-buffer, not revert-file. |
| 6052 | 6052 | ||
| 6053 | 1995-09-22 Torbjorn Einarsson <T.Einarsson@clab.ericsson.se> | 6053 | 1995-09-22 Torbjorn Einarsson <T.Einarsson@clab.ericsson.se> |
| 6054 | 6054 | ||
| 6055 | * f90.el: Major revision. | 6055 | * f90.el: Major revision. |
| 6056 | Much improved and quicker highlighting using font-lock. | 6056 | Much improved and quicker highlighting using font-lock. |
| @@ -6683,7 +6683,7 @@ | |||
| 6683 | * jka-compr.el (jka-compr-byte-compiler-base-file-name): New function. | 6683 | * jka-compr.el (jka-compr-byte-compiler-base-file-name): New function. |
| 6684 | Use it to handle byte-compiler-base-file-name operation. | 6684 | Use it to handle byte-compiler-base-file-name operation. |
| 6685 | 6685 | ||
| 6686 | 1995-08-20 Michael Kifer <Michael Kifer <kifer@cs.sunysb.edu>> | 6686 | 1995-08-20 Michael Kifer <kifer@cs.sunysb.edu> |
| 6687 | 6687 | ||
| 6688 | * viper.el (vip-set-hooks): Use view-mode-hook in emacs and view | 6688 | * viper.el (vip-set-hooks): Use view-mode-hook in emacs and view |
| 6689 | hook in xemacs. | 6689 | hook in xemacs. |
| @@ -6857,7 +6857,7 @@ | |||
| 6857 | * sh-script.el (sh-mode-map): Use new name skeleton-pair-insert-maybe. | 6857 | * sh-script.el (sh-mode-map): Use new name skeleton-pair-insert-maybe. |
| 6858 | (sh-mode): Use new names skeleton-pair-alist, skeleton-pair-filter. | 6858 | (sh-mode): Use new names skeleton-pair-alist, skeleton-pair-filter. |
| 6859 | 6859 | ||
| 6860 | 1995-08-15 Daniel Pfeiffer <Daniel.Pfeiffer@Informatik.START.dbp.de> | 6860 | 1995-08-15 Daniel Pfeiffer <Daniel.Pfeiffer@Informatik.START.dbp.de> |
| 6861 | 6861 | ||
| 6862 | * skeleton.el (skeleton-pair-insert-maybe): Plain insert in Ovwrt mode | 6862 | * skeleton.el (skeleton-pair-insert-maybe): Plain insert in Ovwrt mode |
| 6863 | (skeleton-insert): If skeleton doesn't fit in window, put beginning | 6863 | (skeleton-insert): If skeleton doesn't fit in window, put beginning |
| @@ -7784,7 +7784,7 @@ Wed Jul 26 15:40:00 Michael Kifer (kifer@cs.sunysb.edu) | |||
| 7784 | 7784 | ||
| 7785 | * term/x-win.el (x-colors): Doc fix. | 7785 | * term/x-win.el (x-colors): Doc fix. |
| 7786 | 7786 | ||
| 7787 | 1995-06-30 Kevin Rodgers <kevinr@ihs.com> | 7787 | 1995-06-30 Kevin Rodgers <kevinr@ihs.com> |
| 7788 | 7788 | ||
| 7789 | * mailabbrev.el (mail-resolve-all-aliases-1): | 7789 | * mailabbrev.el (mail-resolve-all-aliases-1): |
| 7790 | Downcase address before recursive call. | 7790 | Downcase address before recursive call. |
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 01852a8ad77..be3b42d8eda 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 | |||
| @@ -735,7 +735,7 @@ | |||
| 735 | * files.el (auto-mode-alist): Fix regular expression error for | 735 | * files.el (auto-mode-alist): Fix regular expression error for |
| 736 | sh-mode. | 736 | sh-mode. |
| 737 | 737 | ||
| 738 | 1998-07-26 Ken'ichi HANDA <handa@etl.go.jp> | 738 | 1998-07-26 Ken'ichi HANDA <handa@etl.go.jp> |
| 739 | 739 | ||
| 740 | * arc-mode.el (archive-summarize): Set buffer unibyte before | 740 | * arc-mode.el (archive-summarize): Set buffer unibyte before |
| 741 | calling archive-XXX-summarize. | 741 | calling archive-XXX-summarize. |
| @@ -1297,7 +1297,7 @@ | |||
| 1297 | 1297 | ||
| 1298 | * language/misc-lang.el ("IPA"): Add coding-priority and coding-system. | 1298 | * language/misc-lang.el ("IPA"): Add coding-priority and coding-system. |
| 1299 | 1299 | ||
| 1300 | 1998-07-07 Kevin Rodgers <kevinr@ihs.com> | 1300 | 1998-07-07 Kevin Rodgers <kevinr@ihs.com> |
| 1301 | 1301 | ||
| 1302 | * vc.el (vc-finish-logentry): Only delete windows in the | 1302 | * vc.el (vc-finish-logentry): Only delete windows in the |
| 1303 | selected frame displaying the *VC-log* buffer, in case another | 1303 | selected frame displaying the *VC-log* buffer, in case another |
| @@ -1905,7 +1905,7 @@ | |||
| 1905 | (japanese-hankaku-region): Likewise. | 1905 | (japanese-hankaku-region): Likewise. |
| 1906 | (japanese-zenkaku-region): Likewise. | 1906 | (japanese-zenkaku-region): Likewise. |
| 1907 | 1907 | ||
| 1908 | 1998-06-22 WJCarpenter <bill@carpenter.ORG> | 1908 | 1998-06-22 WJCarpenter <bill@carpenter.ORG> |
| 1909 | 1909 | ||
| 1910 | * mail/feedmail.el: New file. | 1910 | * mail/feedmail.el: New file. |
| 1911 | 1911 | ||
| @@ -2475,7 +2475,7 @@ | |||
| 2475 | * rsz-mini.el (resize-minibuffer-mode): | 2475 | * rsz-mini.el (resize-minibuffer-mode): |
| 2476 | * iswitchb.el (iswitchb-read-buffer): Add autoload cookie. | 2476 | * iswitchb.el (iswitchb-read-buffer): Add autoload cookie. |
| 2477 | 2477 | ||
| 2478 | 1998-06-03 Kevin Rodgers <kevinr@ihs.com> | 2478 | 1998-06-03 Kevin Rodgers <kevinr@ihs.com> |
| 2479 | 2479 | ||
| 2480 | * replace.el (esc-map): Bind C-M-% to query-replace-regexp. | 2480 | * replace.el (esc-map): Bind C-M-% to query-replace-regexp. |
| 2481 | 2481 | ||
| @@ -2604,7 +2604,7 @@ | |||
| 2604 | * international/mule.el (coding-system-mnemonic): | 2604 | * international/mule.el (coding-system-mnemonic): |
| 2605 | Don't crash if arg is nil. | 2605 | Don't crash if arg is nil. |
| 2606 | 2606 | ||
| 2607 | 1998-05-31 Alan Shutko <shutkoa@ugsolutions.com> | 2607 | 1998-05-31 Alan Shutko <shutkoa@ugsolutions.com> |
| 2608 | 2608 | ||
| 2609 | * emacs-lisp/easy-mmode.el (easy-mmode-define-minor-mode): Add | 2609 | * emacs-lisp/easy-mmode.el (easy-mmode-define-minor-mode): Add |
| 2610 | missing format arg. | 2610 | missing format arg. |
| @@ -2613,7 +2613,7 @@ | |||
| 2613 | 2613 | ||
| 2614 | * finder.el (finder-known-keywords): Fix `convenience' entry. | 2614 | * finder.el (finder-known-keywords): Fix `convenience' entry. |
| 2615 | 2615 | ||
| 2616 | 1998-05-30 Richard Stallman <rms@gnu.org> | 2616 | 1998-05-30 Richard Stallman <rms@gnu.org> |
| 2617 | 2617 | ||
| 2618 | * textmodes/tex-mode.el: Undo May 15 change. | 2618 | * textmodes/tex-mode.el: Undo May 15 change. |
| 2619 | 2619 | ||
| @@ -2752,7 +2752,7 @@ | |||
| 2752 | * autoinsert.el: | 2752 | * autoinsert.el: |
| 2753 | * abbrev.el: Likewise. | 2753 | * abbrev.el: Likewise. |
| 2754 | 2754 | ||
| 2755 | 1998-05-26 Emilio Lopes <Emilio.Lopes@Physik.TU-Muenchen.DE> | 2755 | 1998-05-26 Emilio Lopes <Emilio.Lopes@Physik.TU-Muenchen.DE> |
| 2756 | and Karl Fogel <kfogel@red-bean.com> | 2756 | and Karl Fogel <kfogel@red-bean.com> |
| 2757 | 2757 | ||
| 2758 | * bookmark.el: Changes so bookmark list mode works with Info: | 2758 | * bookmark.el: Changes so bookmark list mode works with Info: |
| @@ -4121,7 +4121,7 @@ | |||
| 4121 | 4121 | ||
| 4122 | * ffap.el (dired-at-point): Add autoload cookie. | 4122 | * ffap.el (dired-at-point): Add autoload cookie. |
| 4123 | 4123 | ||
| 4124 | 1998-04-23 Jens Petersen <petersen@kurims.kyoto-u.ac.jp> | 4124 | 1998-04-23 Jens Petersen <petersen@kurims.kyoto-u.ac.jp> |
| 4125 | 4125 | ||
| 4126 | * ffap.el (dired-at-point-require-prefix): New option. | 4126 | * ffap.el (dired-at-point-require-prefix): New option. |
| 4127 | (dired-at-point): New command. | 4127 | (dired-at-point): New command. |
| @@ -5871,7 +5871,7 @@ | |||
| 5871 | 5871 | ||
| 5872 | * battery.el: Fixed spelling of `autoload' magic cookies. | 5872 | * battery.el: Fixed spelling of `autoload' magic cookies. |
| 5873 | 5873 | ||
| 5874 | 1998-03-05 Sam Steingold <sds@usa.net> | 5874 | 1998-03-05 Sam Steingold <sds@usa.net> |
| 5875 | 5875 | ||
| 5876 | * lisp/simple.el (backward-delete-char-untabify-method): | 5876 | * lisp/simple.el (backward-delete-char-untabify-method): |
| 5877 | New user option. | 5877 | New user option. |
| @@ -5898,7 +5898,7 @@ | |||
| 5898 | 5898 | ||
| 5899 | * subr.el (sref): Increase CHAR in the while loop. | 5899 | * subr.el (sref): Increase CHAR in the while loop. |
| 5900 | 5900 | ||
| 5901 | 1998-03-03 Sam Steingold <sds@usa.net> | 5901 | 1998-03-03 Sam Steingold <sds@usa.net> |
| 5902 | 5902 | ||
| 5903 | * dired.el (dired-quit): Function deleted. | 5903 | * dired.el (dired-quit): Function deleted. |
| 5904 | (dired-mode-map): Use quit-window for q. | 5904 | (dired-mode-map): Use quit-window for q. |
| @@ -7508,7 +7508,7 @@ | |||
| 7508 | * avoid.el (mouse-avoidance-mode): Variable customized to | 7508 | * avoid.el (mouse-avoidance-mode): Variable customized to |
| 7509 | automatically load the package. | 7509 | automatically load the package. |
| 7510 | 7510 | ||
| 7511 | 1997-12-22 Kevin Rodgers <kevinr@ihs.com> | 7511 | 1997-12-22 Kevin Rodgers <kevinr@ihs.com> |
| 7512 | 7512 | ||
| 7513 | * simple.el (previous-matching-history-element): Bind | 7513 | * simple.el (previous-matching-history-element): Bind |
| 7514 | case-fold-search to nil if REGEXP contains an uppercase letter. | 7514 | case-fold-search to nil if REGEXP contains an uppercase letter. |
| @@ -9275,7 +9275,7 @@ | |||
| 9275 | 9275 | ||
| 9276 | * gnus.el: Gnus v5.4.56 is released. | 9276 | * gnus.el: Gnus v5.4.56 is released. |
| 9277 | 9277 | ||
| 9278 | 1997-10-21 Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp> | 9278 | 1997-10-21 Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp> |
| 9279 | 9279 | ||
| 9280 | * message.el (message-make-in-reply-to): Make valid In-Reply-To. | 9280 | * message.el (message-make-in-reply-to): Make valid In-Reply-To. |
| 9281 | 9281 | ||
| @@ -9284,7 +9284,7 @@ | |||
| 9284 | * gnus-art.el (gnus-header-button-alist): Check for URLs in the | 9284 | * gnus-art.el (gnus-header-button-alist): Check for URLs in the |
| 9285 | Subject. | 9285 | Subject. |
| 9286 | 9286 | ||
| 9287 | 1997-10-21 Hrvoje Niksic <hniksic@srce.hr> | 9287 | 1997-10-21 Hrvoje Niksic <hniksic@srce.hr> |
| 9288 | 9288 | ||
| 9289 | * gnus-xmas.el: Cleanup. | 9289 | * gnus-xmas.el: Cleanup. |
| 9290 | 9290 | ||
| @@ -9292,12 +9292,12 @@ | |||
| 9292 | 9292 | ||
| 9293 | * gnus-art.el (gnus-output-to-file): Return t. | 9293 | * gnus-art.el (gnus-output-to-file): Return t. |
| 9294 | 9294 | ||
| 9295 | 1997-10-21 Guy Geens <Guy.Geens@elis.rug.ac.be> | 9295 | 1997-10-21 Guy Geens <Guy.Geens@elis.rug.ac.be> |
| 9296 | 9296 | ||
| 9297 | * gnus-score.el (gnus-decay-score): Make decay work on negative | 9297 | * gnus-score.el (gnus-decay-score): Make decay work on negative |
| 9298 | scores. | 9298 | scores. |
| 9299 | 9299 | ||
| 9300 | 1997-10-21 Kurt Swanson <kurt@dna.lth.se> | 9300 | 1997-10-21 Kurt Swanson <kurt@dna.lth.se> |
| 9301 | 9301 | ||
| 9302 | * nnmail.el (nnmail-article-group): Handle junk properly. | 9302 | * nnmail.el (nnmail-article-group): Handle junk properly. |
| 9303 | 9303 | ||
| @@ -11224,7 +11224,7 @@ | |||
| 11224 | 11224 | ||
| 11225 | * mail/sendmail.el (mail-send): Complain about invalid header line. | 11225 | * mail/sendmail.el (mail-send): Complain about invalid header line. |
| 11226 | 11226 | ||
| 11227 | 1997-08-30 Jerry James <jerry@cs.ucsb.edu> | 11227 | 1997-08-30 Jerry James <jerry@cs.ucsb.edu> |
| 11228 | 11228 | ||
| 11229 | * format.el (format-subtract-regions): New function. | 11229 | * format.el (format-subtract-regions): New function. |
| 11230 | (format-property-increment-region): New function. | 11230 | (format-property-increment-region): New function. |
| @@ -14875,7 +14875,7 @@ | |||
| 14875 | custom-nest-groups controls this. | 14875 | custom-nest-groups controls this. |
| 14876 | <l, i, e>: Indent differently if custom-nest-groups. | 14876 | <l, i, e>: Indent differently if custom-nest-groups. |
| 14877 | 14877 | ||
| 14878 | 1997-06-20 Ryszard Kubiak <rysiek@ipipan.gda.pl> | 14878 | 1997-06-20 Ryszard Kubiak <rysiek@ipipan.gda.pl> |
| 14879 | 14879 | ||
| 14880 | * ogonek.el: Doc fixes. | 14880 | * ogonek.el: Doc fixes. |
| 14881 | (ogonek-jak, ogonek-how): Examples of customization fixed. | 14881 | (ogonek-jak, ogonek-how): Examples of customization fixed. |
| @@ -15021,7 +15021,7 @@ | |||
| 15021 | (reftex-plug-into-AUCTeX) New variable and function. | 15021 | (reftex-plug-into-AUCTeX) New variable and function. |
| 15022 | (reftex-make-master-buffer) Fixed bug with relative path names. | 15022 | (reftex-make-master-buffer) Fixed bug with relative path names. |
| 15023 | 15023 | ||
| 15024 | 1997-06-18 Ryszard Kubiak <rysiek@ipipan.gda.pl> | 15024 | 1997-06-18 Ryszard Kubiak <rysiek@ipipan.gda.pl> |
| 15025 | 15025 | ||
| 15026 | * ogonek.el: Doc Fix. | 15026 | * ogonek.el: Doc Fix. |
| 15027 | (prefix-code): Change the name to `ogonek-prefix-code'. | 15027 | (prefix-code): Change the name to `ogonek-prefix-code'. |
| @@ -18634,7 +18634,7 @@ | |||
| 18634 | 18634 | ||
| 18635 | * skeleton.el (skeleton-read): Doc fix. | 18635 | * skeleton.el (skeleton-read): Doc fix. |
| 18636 | 18636 | ||
| 18637 | 1997-04-24 Per Abrahamsen <abraham@dina.kvl.dk> | 18637 | 1997-04-24 Per Abrahamsen <abraham@dina.kvl.dk> |
| 18638 | 18638 | ||
| 18639 | * widget.el (define-widget): Return name. | 18639 | * widget.el (define-widget): Return name. |
| 18640 | 18640 | ||
| @@ -19673,7 +19673,7 @@ | |||
| 19673 | * mh-utils.el (mh-find-progs): When looking for mh-lib, construct | 19673 | * mh-utils.el (mh-find-progs): When looking for mh-lib, construct |
| 19674 | likely paths based on mh-progs rather than using a static list. | 19674 | likely paths based on mh-progs rather than using a static list. |
| 19675 | 19675 | ||
| 19676 | 1997-03-24 Kevin Rodgers <kevinr@ihs.com> | 19676 | 1997-03-24 Kevin Rodgers <kevinr@ihs.com> |
| 19677 | 19677 | ||
| 19678 | * compile.el (grep-program): New variable. | 19678 | * compile.el (grep-program): New variable. |
| 19679 | (grep-command): Use it, and test whether it supports the -e | 19679 | (grep-command): Use it, and test whether it supports the -e |
| @@ -19949,7 +19949,7 @@ | |||
| 19949 | c-Java-defun-prompt-regexp. | 19949 | c-Java-defun-prompt-regexp. |
| 19950 | (c-guess-basic-syntax): CASE 2: relpos for c and c++ is now boi. | 19950 | (c-guess-basic-syntax): CASE 2: relpos for c and c++ is now boi. |
| 19951 | 19951 | ||
| 19952 | 1997-03-11 Kurt Hornik <Kurt.Hornik@ci.tuwien.ac.at> | 19952 | 1997-03-11 Kurt Hornik <Kurt.Hornik@ci.tuwien.ac.at> |
| 19953 | 19953 | ||
| 19954 | * octave-mod.el (octave-abbrev-table): Add abbrevs for switch, | 19954 | * octave-mod.el (octave-abbrev-table): Add abbrevs for switch, |
| 19955 | case, otherwise, and endswitch. | 19955 | case, otherwise, and endswitch. |
| @@ -19988,7 +19988,7 @@ | |||
| 19988 | (makefile-dependency-regex, makefile-macroassign-regex): Disallow | 19988 | (makefile-dependency-regex, makefile-macroassign-regex): Disallow |
| 19989 | spaces in symbol name. | 19989 | spaces in symbol name. |
| 19990 | 19990 | ||
| 19991 | 1997-03-11 Dan Nicolaescu <done@ece.arizona.edu> | 19991 | 1997-03-11 Dan Nicolaescu <done@ece.arizona.edu> |
| 19992 | 19992 | ||
| 19993 | * subr.el (add-to-invisibility-spec, remove-from-invisibility-spec): | 19993 | * subr.el (add-to-invisibility-spec, remove-from-invisibility-spec): |
| 19994 | New functions. | 19994 | New functions. |
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index e819d7990bb..60bb4e6813d 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 | |||
| @@ -5352,7 +5352,7 @@ | |||
| 5352 | * international/mule-diag.el (describe-coding-system): Fix English | 5352 | * international/mule-diag.el (describe-coding-system): Fix English |
| 5353 | message. | 5353 | message. |
| 5354 | 5354 | ||
| 5355 | 1999-05-03 Jason Rumney <jasonr@altavista.net> | 5355 | 1999-05-03 Jason Rumney <jasonr@altavista.net> |
| 5356 | 5356 | ||
| 5357 | * term/w32-win.el: Change the x-charset-registry property for the | 5357 | * term/w32-win.el: Change the x-charset-registry property for the |
| 5358 | Japanese charsets that are supported by Japanese Windows fonts. | 5358 | Japanese charsets that are supported by Japanese Windows fonts. |
| @@ -5363,7 +5363,7 @@ | |||
| 5363 | diary-block diary entries for which the reminders and the diary | 5363 | diary-block diary entries for which the reminders and the diary |
| 5364 | entries can overlap. | 5364 | entries can overlap. |
| 5365 | 5365 | ||
| 5366 | 1999-05-02 Jason Rumney <jasonr@altavista.net> | 5366 | 1999-05-02 Jason Rumney <jasonr@altavista.net> |
| 5367 | 5367 | ||
| 5368 | * term/w32-win.el (mouse-set-font): Ensure constructed fontset | 5368 | * term/w32-win.el (mouse-set-font): Ensure constructed fontset |
| 5369 | matches the font selected in the dialog. | 5369 | matches the font selected in the dialog. |
| @@ -5573,7 +5573,7 @@ | |||
| 5573 | * jka-compr.el (jka-compr-insert-file-contents): | 5573 | * jka-compr.el (jka-compr-insert-file-contents): |
| 5574 | Use raw-text-unix when we want no conversion. | 5574 | Use raw-text-unix when we want no conversion. |
| 5575 | 5575 | ||
| 5576 | 1999-04-06 Thierry Emery <Thierry.Emery@nmu.alcatel.fr> | 5576 | 1999-04-06 Thierry Emery <Thierry.Emery@nmu.alcatel.fr> |
| 5577 | 5577 | ||
| 5578 | * timezone.el (timezone-parse-date): Corrected regexp for | 5578 | * timezone.el (timezone-parse-date): Corrected regexp for |
| 5579 | style (5) date format so that tenths of seconds are optional. | 5579 | style (5) date format so that tenths of seconds are optional. |
| @@ -5738,7 +5738,7 @@ | |||
| 5738 | * font-lock.el (c-font-lock-keywords-2): Added "complex" type. | 5738 | * font-lock.el (c-font-lock-keywords-2): Added "complex" type. |
| 5739 | (java-font-lock-keywords-2): Added "strictfp" keyword. | 5739 | (java-font-lock-keywords-2): Added "strictfp" keyword. |
| 5740 | 5740 | ||
| 5741 | 1999-03-17 Jason Rumney <jasonr@altavista.net> | 5741 | 1999-03-17 Jason Rumney <jasonr@altavista.net> |
| 5742 | 5742 | ||
| 5743 | * w32-fns.el (set-w32-system-coding-system) New function. | 5743 | * w32-fns.el (set-w32-system-coding-system) New function. |
| 5744 | (w32-system-coding-system) Initialize to 'iso-latin-1. | 5744 | (w32-system-coding-system) Initialize to 'iso-latin-1. |
| @@ -5772,7 +5772,7 @@ | |||
| 5772 | 5772 | ||
| 5773 | * font-lock.el (c-font-lock-keywords-2): Added "restrict" keyword. | 5773 | * font-lock.el (c-font-lock-keywords-2): Added "restrict" keyword. |
| 5774 | 5774 | ||
| 5775 | 1999-03-14 Milan Zamazal <pdm@pvt.net> | 5775 | 1999-03-14 Milan Zamazal <pdm@pvt.net> |
| 5776 | 5776 | ||
| 5777 | * abbrev.el (inverse-add-abbrev): Inherit the current input method. | 5777 | * abbrev.el (inverse-add-abbrev): Inherit the current input method. |
| 5778 | 5778 | ||
| @@ -5868,7 +5868,7 @@ | |||
| 5868 | 5868 | ||
| 5869 | * mail/smtpmail.el (smtpmail-do-bcc): Fix regexp. | 5869 | * mail/smtpmail.el (smtpmail-do-bcc): Fix regexp. |
| 5870 | 5870 | ||
| 5871 | 1999-03-08 Jason Rumney <jasonr@altavista.net> | 5871 | 1999-03-08 Jason Rumney <jasonr@altavista.net> |
| 5872 | 5872 | ||
| 5873 | * international/codepage.el (cp1250-decode-table) | 5873 | * international/codepage.el (cp1250-decode-table) |
| 5874 | (cp1251-decode-table, cp1253-decode-table) | 5874 | (cp1251-decode-table, cp1253-decode-table) |
| @@ -6594,7 +6594,7 @@ | |||
| 6594 | * font-lock.el (font-lock-default-unfontify-region): | 6594 | * font-lock.el (font-lock-default-unfontify-region): |
| 6595 | If not font-lock-syntactic-keywords, don't remove syntax-table prop. | 6595 | If not font-lock-syntactic-keywords, don't remove syntax-table prop. |
| 6596 | 6596 | ||
| 6597 | 1999-01-27 Jason Rumney <jasonr@altavista.net> | 6597 | 1999-01-27 Jason Rumney <jasonr@altavista.net> |
| 6598 | 6598 | ||
| 6599 | * term/w32-win.el (w32-standard-fontset-spec): Remove wildcard | 6599 | * term/w32-win.el (w32-standard-fontset-spec): Remove wildcard |
| 6600 | from FAMILY field. | 6600 | from FAMILY field. |
| @@ -6769,7 +6769,7 @@ | |||
| 6769 | * midnight.el (clean-buffer-list): Do not kill a buffer if it has | 6769 | * midnight.el (clean-buffer-list): Do not kill a buffer if it has |
| 6770 | a process associated with it. | 6770 | a process associated with it. |
| 6771 | 6771 | ||
| 6772 | 1999-01-22 Jason Rumney <jasonr@altavista.net> | 6772 | 1999-01-22 Jason Rumney <jasonr@altavista.net> |
| 6773 | 6773 | ||
| 6774 | * term/w32-win.el (w32-standard-fontset-spec): Simplified. | 6774 | * term/w32-win.el (w32-standard-fontset-spec): Simplified. |
| 6775 | 6775 | ||
| @@ -6803,7 +6803,7 @@ | |||
| 6803 | * wid-edit.el (widget-alist-convert-option): Delete spurious comma. | 6803 | * wid-edit.el (widget-alist-convert-option): Delete spurious comma. |
| 6804 | (widget-plist-convert-option): Delete spurious comma. | 6804 | (widget-plist-convert-option): Delete spurious comma. |
| 6805 | 6805 | ||
| 6806 | 1999-01-19 Jason Rumney <jasonr@altavista.net> | 6806 | 1999-01-19 Jason Rumney <jasonr@altavista.net> |
| 6807 | 6807 | ||
| 6808 | * term/w32-win.el (w32-standard-fontspec-spec): Change | 6808 | * term/w32-win.el (w32-standard-fontspec-spec): Change |
| 6809 | iso8859-5 to koi8-r. Add iso8859-9. | 6809 | iso8859-5 to koi8-r. Add iso8859-9. |
| @@ -7324,7 +7324,7 @@ | |||
| 7324 | argument requires specific EOL conversion type, make the default | 7324 | argument requires specific EOL conversion type, make the default |
| 7325 | coding systems use that. | 7325 | coding systems use that. |
| 7326 | 7326 | ||
| 7327 | 1998-12-30 Drew Csillag <drew_csillag@geocities.com> | 7327 | 1998-12-30 Drew Csillag <drew_csillag@geocities.com> |
| 7328 | 7328 | ||
| 7329 | * progmodes/m4-mode.el (m4-m4-region, m4-m4-buffer): | 7329 | * progmodes/m4-mode.el (m4-m4-region, m4-m4-buffer): |
| 7330 | Use shell-command-on-region. | 7330 | Use shell-command-on-region. |
| @@ -8493,7 +8493,7 @@ | |||
| 8493 | set-minibuffer-window to set minibuffer window of the current | 8493 | set-minibuffer-window to set minibuffer window of the current |
| 8494 | frame correctly. | 8494 | frame correctly. |
| 8495 | 8495 | ||
| 8496 | 1998-11-03 Theodore Jump <tjump@tertius.com> | 8496 | 1998-11-03 Theodore Jump <tjump@tertius.com> |
| 8497 | 8497 | ||
| 8498 | * term/w32-win.el: Require fontset. | 8498 | * term/w32-win.el: Require fontset. |
| 8499 | 8499 | ||
| @@ -8687,7 +8687,7 @@ | |||
| 8687 | (ps-mule-initialize, ps-mule-begin, ps-face-bold-p, ps-do-despool): | 8687 | (ps-mule-initialize, ps-mule-begin, ps-face-bold-p, ps-do-despool): |
| 8688 | Programming style normalization. | 8688 | Programming style normalization. |
| 8689 | 8689 | ||
| 8690 | 1998-10-26 Kenichi Handa <handa@etl.go.jp> | 8690 | 1998-10-26 Kenichi Handa <handa@etl.go.jp> |
| 8691 | 8691 | ||
| 8692 | * ps-print.el: To make it work also on Emacs 20.2 and the earlier | 8692 | * ps-print.el: To make it work also on Emacs 20.2 and the earlier |
| 8693 | version, check the value of mule-version. | 8693 | version, check the value of mule-version. |
| @@ -9870,7 +9870,7 @@ | |||
| 9870 | * gnus/gnus-start.el (gnus-save-newsrc-file): Bind | 9870 | * gnus/gnus-start.el (gnus-save-newsrc-file): Bind |
| 9871 | coding-system-for-write before saving. | 9871 | coding-system-for-write before saving. |
| 9872 | 9872 | ||
| 9873 | 1998-08-26 Kevin Rodgers <kevinr@ihs.com> | 9873 | 1998-08-26 Kevin Rodgers <kevinr@ihs.com> |
| 9874 | 9874 | ||
| 9875 | * isearch.el (isearch-forward): Doc fix. | 9875 | * isearch.el (isearch-forward): Doc fix. |
| 9876 | 9876 | ||
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 7976756f1e6..ceb67da9447 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 | |||
| @@ -294,7 +294,7 @@ | |||
| 294 | that &rest VAR is the last element, and that variables aren't doubled. | 294 | that &rest VAR is the last element, and that variables aren't doubled. |
| 295 | (byte-compile-lambda): Use it. | 295 | (byte-compile-lambda): Use it. |
| 296 | 296 | ||
| 297 | 2001-10-12 Eli Barzilay <eli@barzilay.org> | 297 | 2001-10-12 Eli Barzilay <eli@barzilay.org> |
| 298 | 298 | ||
| 299 | * calculator.el (calculator-eng-display): Don't call concat | 299 | * calculator.el (calculator-eng-display): Don't call concat |
| 300 | with an integer argument. | 300 | with an integer argument. |
| @@ -1242,7 +1242,7 @@ | |||
| 1242 | (quail-activate): Mention the hooks these functions run in their | 1242 | (quail-activate): Mention the hooks these functions run in their |
| 1243 | doc strings. | 1243 | doc strings. |
| 1244 | 1244 | ||
| 1245 | 2001-09-05 Edward M. Reingold <reingold@iit.edu> | 1245 | 2001-09-05 Edward M. Reingold <reingold@iit.edu> |
| 1246 | 1246 | ||
| 1247 | * cal-menu.el (calendar-mouse-view-other-diary-entries): Fix name | 1247 | * cal-menu.el (calendar-mouse-view-other-diary-entries): Fix name |
| 1248 | of file in header of menu. | 1248 | of file in header of menu. |
| @@ -1629,7 +1629,7 @@ | |||
| 1629 | window-scroll-functions are run with a window start that's | 1629 | window-scroll-functions are run with a window start that's |
| 1630 | temporarily outside of the restriction. | 1630 | temporarily outside of the restriction. |
| 1631 | 1631 | ||
| 1632 | 2001-08-16 Robert J. Chassell <bug-texinfo@gnu.org> | 1632 | 2001-08-16 Robert J. Chassell <bug-texinfo@gnu.org> |
| 1633 | 1633 | ||
| 1634 | * textmodes/texnfo-upd.el: Update copyright notice, fix minor typos. | 1634 | * textmodes/texnfo-upd.el: Update copyright notice, fix minor typos. |
| 1635 | (texinfo-find-lower-level-node, texinfo-find-higher-level-node) | 1635 | (texinfo-find-lower-level-node, texinfo-find-higher-level-node) |
| @@ -3835,7 +3835,7 @@ | |||
| 3835 | final computational form, which was unnecessary; corrected a | 3835 | final computational form, which was unnecessary; corrected a |
| 3836 | parsing problem when timeclock-relative was nil. | 3836 | parsing problem when timeclock-relative was nil. |
| 3837 | 3837 | ||
| 3838 | 2001-04-23 Kahlil Hodgson <kahlil@discus.anu.edu.au> | 3838 | 2001-04-23 Kahlil Hodgson <kahlil@discus.anu.edu.au> |
| 3839 | 3839 | ||
| 3840 | * calendar/timeclock.el (timeclock-modeline-display): Check if | 3840 | * calendar/timeclock.el (timeclock-modeline-display): Check if |
| 3841 | `list-entry' is null. | 3841 | `list-entry' is null. |
| @@ -4060,7 +4060,7 @@ | |||
| 4060 | (ps-fonts, ps-font-number, ps-rgb-color, ps-end-page, ps-next-page) | 4060 | (ps-fonts, ps-font-number, ps-rgb-color, ps-end-page, ps-next-page) |
| 4061 | (ps-skip-newline): Replace defun by defsubst. | 4061 | (ps-skip-newline): Replace defun by defsubst. |
| 4062 | 4062 | ||
| 4063 | 2001-04-10 Colin Walters <walters@cis.ohio-state.edu> | 4063 | 2001-04-10 Colin Walters <walters@cis.ohio-state.edu> |
| 4064 | 4064 | ||
| 4065 | * eshell/eshell.el (eshell-command): Needed a "%s" format | 4065 | * eshell/eshell.el (eshell-command): Needed a "%s" format |
| 4066 | specifier, in case the buffer contains percent characters. | 4066 | specifier, in case the buffer contains percent characters. |
| @@ -5538,7 +5538,7 @@ | |||
| 5538 | 5538 | ||
| 5539 | * international/mule-cmds.el (set-input-method): Another doc fix. | 5539 | * international/mule-cmds.el (set-input-method): Another doc fix. |
| 5540 | 5540 | ||
| 5541 | 2001-02-13 David M. Koppelman <koppel@ee.lsu.edu> | 5541 | 2001-02-13 David M. Koppelman <koppel@ee.lsu.edu> |
| 5542 | 5542 | ||
| 5543 | * hi-lock.el (hi-lock-find-patterns): Don't activate font-lock-mode. | 5543 | * hi-lock.el (hi-lock-find-patterns): Don't activate font-lock-mode. |
| 5544 | 5544 | ||
| @@ -5702,7 +5702,7 @@ | |||
| 5702 | * makefile.w32-in (EMACS): Use $(THISDIR) to make emacs.exe path | 5702 | * makefile.w32-in (EMACS): Use $(THISDIR) to make emacs.exe path |
| 5703 | absolute. | 5703 | absolute. |
| 5704 | 5704 | ||
| 5705 | 2001-02-06 David M. Koppelman <koppel@ee.lsu.edu> | 5705 | 2001-02-06 David M. Koppelman <koppel@ee.lsu.edu> |
| 5706 | 5706 | ||
| 5707 | * hi-lock.el (hi-lock-mode): Toggling hi-lock-mode now affects all | 5707 | * hi-lock.el (hi-lock-mode): Toggling hi-lock-mode now affects all |
| 5708 | buffers. When hi-lock turned on rather than only checking current | 5708 | buffers. When hi-lock turned on rather than only checking current |
| @@ -6253,7 +6253,7 @@ | |||
| 6253 | 6253 | ||
| 6254 | * ediff-vers.el: Fix for 8+3 DOS file systems. | 6254 | * ediff-vers.el: Fix for 8+3 DOS file systems. |
| 6255 | 6255 | ||
| 6256 | 2001-01-19 Colin Walters <walters@cis.ohio-state.edu> | 6256 | 2001-01-19 Colin Walters <walters@cis.ohio-state.edu> |
| 6257 | 6257 | ||
| 6258 | * ediff-util.el (ediff-compare-custom-diffs-maybe): Put diff in | 6258 | * ediff-util.el (ediff-compare-custom-diffs-maybe): Put diff in |
| 6259 | diff mode, if available. | 6259 | diff mode, if available. |
| @@ -8108,7 +8108,7 @@ | |||
| 8108 | 8108 | ||
| 8109 | * select.el (x-get-selection): Docstring fix. | 8109 | * select.el (x-get-selection): Docstring fix. |
| 8110 | 8110 | ||
| 8111 | 2000-11-27 Dave Pearson <davep@hagbard.demon.co.uk> | 8111 | 2000-11-27 Dave Pearson <davep@hagbard.demon.co.uk> |
| 8112 | 8112 | ||
| 8113 | * play/5x5.el (5x5-play-solution): Bind hinhibit-quit to t. | 8113 | * play/5x5.el (5x5-play-solution): Bind hinhibit-quit to t. |
| 8114 | 8114 | ||
| @@ -8251,7 +8251,7 @@ | |||
| 8251 | (iswitchb-entryfn-p): If minibuffer-depth returns the same value | 8251 | (iswitchb-entryfn-p): If minibuffer-depth returns the same value |
| 8252 | as recorded in iswitchb-minibuf-depth, return non-nil. | 8252 | as recorded in iswitchb-minibuf-depth, return non-nil. |
| 8253 | 8253 | ||
| 8254 | 2000-11-23 Eli Zaretskii <eliz@is.elta.co.il> | 8254 | 2000-11-23 Eli Zaretskii <eliz@is.elta.co.il> |
| 8255 | 8255 | ||
| 8256 | * hscroll.el (turn-on-hscroll, hscroll-mode, hscroll-global-mode) | 8256 | * hscroll.el (turn-on-hscroll, hscroll-mode, hscroll-global-mode) |
| 8257 | (hscroll-window-maybe): Docstring fix. | 8257 | (hscroll-window-maybe): Docstring fix. |
| @@ -8513,7 +8513,7 @@ | |||
| 8513 | 8513 | ||
| 8514 | * Makefile.in (DONTCOMPILE): Omit bindings.el. | 8514 | * Makefile.in (DONTCOMPILE): Omit bindings.el. |
| 8515 | 8515 | ||
| 8516 | 2000-11-20 Eli Barzilay <eli@www.barzilay.org> | 8516 | 2000-11-20 Eli Barzilay <eli@www.barzilay.org> |
| 8517 | 8517 | ||
| 8518 | * calculator.el (calculator-paste): Use `if' instead of `and' | 8518 | * calculator.el (calculator-paste): Use `if' instead of `and' |
| 8519 | and `or'. | 8519 | and `or'. |
| @@ -8554,7 +8554,7 @@ | |||
| 8554 | (mode-line-toggle-modified, mode-line-widen) | 8554 | (mode-line-toggle-modified, mode-line-widen) |
| 8555 | (mode-line-abbrev-mode, mode-line-auto-fill-mode): Fix typos. | 8555 | (mode-line-abbrev-mode, mode-line-auto-fill-mode): Fix typos. |
| 8556 | 8556 | ||
| 8557 | 2000-11-17 Vinicius Jose Latorre <vinicius@cpqd.com.br> | 8557 | 2000-11-17 Vinicius Jose Latorre <vinicius@cpqd.com.br> |
| 8558 | 8558 | ||
| 8559 | * ps-print.el (toplevel): Test for find-coding-system being | 8559 | * ps-print.el (toplevel): Test for find-coding-system being |
| 8560 | fboundp before calling ps-x-find-coding-system. | 8560 | fboundp before calling ps-x-find-coding-system. |
| @@ -14379,7 +14379,7 @@ | |||
| 14379 | * progmodes/icon.el (icon-indent-line) | 14379 | * progmodes/icon.el (icon-indent-line) |
| 14380 | (icon-is-continuation-line): Handle comments specially. | 14380 | (icon-is-continuation-line): Handle comments specially. |
| 14381 | 14381 | ||
| 14382 | 2000-08-17 Ken Stevens <k.stevens@ieee.org> | 14382 | 2000-08-17 Ken Stevens <k.stevens@ieee.org> |
| 14383 | 14383 | ||
| 14384 | * ispell.el: Set to standard author/maintainer/keyword fields. | 14384 | * ispell.el: Set to standard author/maintainer/keyword fields. |
| 14385 | Fine tuning to menu map appearance and operation, and added help. | 14385 | Fine tuning to menu map appearance and operation, and added help. |
| @@ -15769,7 +15769,7 @@ | |||
| 15769 | 15769 | ||
| 15770 | * gnus/parse-time.el: Correct author's mail address. | 15770 | * gnus/parse-time.el: Correct author's mail address. |
| 15771 | 15771 | ||
| 15772 | 2000-07-19 Colin Walters <walters@cis.ohio-state.edu> | 15772 | 2000-07-19 Colin Walters <walters@cis.ohio-state.edu> |
| 15773 | 15773 | ||
| 15774 | * comint.el (comint-highlight-input, comint-highlight-face): | 15774 | * comint.el (comint-highlight-input, comint-highlight-face): |
| 15775 | New user options. | 15775 | New user options. |
| @@ -16628,7 +16628,7 @@ | |||
| 16628 | * info.el: Doc fixes. | 16628 | * info.el: Doc fixes. |
| 16629 | (Info-build-node-completions): Match Ref tags. | 16629 | (Info-build-node-completions): Match Ref tags. |
| 16630 | 16630 | ||
| 16631 | 2000-06-13 Eli Zaretskii <eliz@is.elta.co.il> | 16631 | 2000-06-13 Eli Zaretskii <eliz@is.elta.co.il> |
| 16632 | 16632 | ||
| 16633 | * frame.el (display-multi-frame-p, display-multi-font-p): New | 16633 | * frame.el (display-multi-frame-p, display-multi-font-p): New |
| 16634 | defaliases for display-graphic-p. | 16634 | defaliases for display-graphic-p. |
| @@ -17175,7 +17175,7 @@ | |||
| 17175 | * simple.el (newline): Don't bind before-change-function, | 17175 | * simple.el (newline): Don't bind before-change-function, |
| 17176 | after-change-function. | 17176 | after-change-function. |
| 17177 | 17177 | ||
| 17178 | 2000-05-31 Rajesh Vaidheeswarran <rv@gnu.org> | 17178 | 2000-05-31 Rajesh Vaidheeswarran <rv@gnu.org> |
| 17179 | 17179 | ||
| 17180 | * whitespace.el (whitespace-rescan-timer-time): Update interval | 17180 | * whitespace.el (whitespace-rescan-timer-time): Update interval |
| 17181 | set to 600 seconds (10 minutes) instead of 60 seconds since | 17181 | set to 600 seconds (10 minutes) instead of 60 seconds since |
| @@ -18218,7 +18218,7 @@ | |||
| 18218 | * gud.el (gud-gdb-find-file): Call find-file-noselect with NOWARN | 18218 | * gud.el (gud-gdb-find-file): Call find-file-noselect with NOWARN |
| 18219 | argument. | 18219 | argument. |
| 18220 | 18220 | ||
| 18221 | 2000-04-27 Sen Nagata <sen@eccosys.com> | 18221 | 2000-04-27 Sen Nagata <sen@eccosys.com> |
| 18222 | 18222 | ||
| 18223 | * emacs-lisp/crm.el (crm-completion-table): New variable. | 18223 | * emacs-lisp/crm.el (crm-completion-table): New variable. |
| 18224 | (crm-collection-fn, crm-test-completion) | 18224 | (crm-collection-fn, crm-test-completion) |
| @@ -19191,7 +19191,7 @@ | |||
| 19191 | 19191 | ||
| 19192 | * emacs-lisp/re-builder.el: Remove RCS Id, remove history comment. | 19192 | * emacs-lisp/re-builder.el: Remove RCS Id, remove history comment. |
| 19193 | 19193 | ||
| 19194 | 2000-03-12 Detlev Zundel <detlev.zundel@stud.uni-karlsruhe.de> | 19194 | 2000-03-12 Detlev Zundel <detlev.zundel@stud.uni-karlsruhe.de> |
| 19195 | 19195 | ||
| 19196 | * emacs-lisp/re-builder.el (reb-re-syntax): Fix typo in `:type'. | 19196 | * emacs-lisp/re-builder.el (reb-re-syntax): Fix typo in `:type'. |
| 19197 | Fix comment. | 19197 | Fix comment. |
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 8c06ad65227..3d22b901bb8 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -248,7 +248,7 @@ compile-always: $(lisp)/subdirs.el doit | |||
| 248 | fi \ | 248 | fi \ |
| 249 | done | 249 | done |
| 250 | 250 | ||
| 251 | compile-calc: | 251 | compile-calc: |
| 252 | for el in `find $(lisp)/calc -name '*.el'`; do \ | 252 | for el in `find $(lisp)/calc -name '*.el'`; do \ |
| 253 | echo Compiling $$el; \ | 253 | echo Compiling $$el; \ |
| 254 | $(emacs) -f batch-byte-compile $$el || exit 1; \ | 254 | $(emacs) -f batch-byte-compile $$el || exit 1; \ |
diff --git a/lisp/indent.el b/lisp/indent.el index ed5ff8729fc..2231b478418 100644 --- a/lisp/indent.el +++ b/lisp/indent.el | |||
| @@ -303,16 +303,16 @@ If `auto-fill-mode' is active, re-fills region to fit in new margin." | |||
| 303 | With optional argument, move forward N-1 lines first. | 303 | With optional argument, move forward N-1 lines first. |
| 304 | From the beginning of the line, moves past the left-margin indentation, the | 304 | From the beginning of the line, moves past the left-margin indentation, the |
| 305 | fill-prefix, and any indentation used for centering or right-justifying the | 305 | fill-prefix, and any indentation used for centering or right-justifying the |
| 306 | line, but does not move past any whitespace that was explicitly inserted | 306 | line, but does not move past any whitespace that was explicitly inserted |
| 307 | \(such as a tab used to indent the first line of a paragraph)." | 307 | \(such as a tab used to indent the first line of a paragraph)." |
| 308 | (interactive "p") | 308 | (interactive "p") |
| 309 | (beginning-of-line n) | 309 | (beginning-of-line n) |
| 310 | (skip-chars-forward " \t") | 310 | (skip-chars-forward " \t") |
| 311 | ;; Skip over fill-prefix. | 311 | ;; Skip over fill-prefix. |
| 312 | (if (and fill-prefix | 312 | (if (and fill-prefix |
| 313 | (not (string-equal fill-prefix ""))) | 313 | (not (string-equal fill-prefix ""))) |
| 314 | (if (equal fill-prefix | 314 | (if (equal fill-prefix |
| 315 | (buffer-substring | 315 | (buffer-substring |
| 316 | (point) (min (point-max) (+ (length fill-prefix) (point))))) | 316 | (point) (min (point-max) (+ (length fill-prefix) (point))))) |
| 317 | (forward-char (length fill-prefix))) | 317 | (forward-char (length fill-prefix))) |
| 318 | (if (and adaptive-fill-mode adaptive-fill-regexp | 318 | (if (and adaptive-fill-mode adaptive-fill-regexp |
diff --git a/lisp/informat.el b/lisp/informat.el index baec500ec78..1b07792fa66 100644 --- a/lisp/informat.el +++ b/lisp/informat.el | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | (let (tag-list | 57 | (let (tag-list |
| 58 | refillp | 58 | refillp |
| 59 | (case-fold-search t) | 59 | (case-fold-search t) |
| 60 | (regexp | 60 | (regexp |
| 61 | (concat | 61 | (concat |
| 62 | "\\(" | 62 | "\\(" |
| 63 | 63 | ||
| @@ -116,7 +116,7 @@ | |||
| 116 | (delete-region (match-beginning 0) (match-end 0)))) | 116 | (delete-region (match-beginning 0) (match-end 0)))) |
| 117 | ;; else this is a Node | 117 | ;; else this is a Node |
| 118 | (setq tag-list | 118 | (setq tag-list |
| 119 | (cons (list | 119 | (cons (list |
| 120 | (concat "Node: " (match-string-no-properties 13)) | 120 | (concat "Node: " (match-string-no-properties 13)) |
| 121 | (1+ (match-beginning 10))) | 121 | (1+ (match-beginning 10))) |
| 122 | tag-list)))) | 122 | tag-list)))) |
| @@ -453,7 +453,7 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\"" | |||
| 453 | (cond ((not (file-exists-p file)) | 453 | (cond ((not (file-exists-p file)) |
| 454 | (message ">> %s does not exist!" file) | 454 | (message ">> %s does not exist!" file) |
| 455 | (setq error 1 | 455 | (setq error 1 |
| 456 | command-line-args-left (cdr command-line-args-left))) | 456 | command-line-args-left (cdr command-line-args-left))) |
| 457 | ((file-directory-p file) | 457 | ((file-directory-p file) |
| 458 | (setq command-line-args-left (nconc (directory-files file) | 458 | (setq command-line-args-left (nconc (directory-files file) |
| 459 | (cdr command-line-args-left)))) | 459 | (cdr command-line-args-left)))) |
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index d24f737851b..ac384a3a874 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el | |||
| @@ -183,7 +183,7 @@ | |||
| 183 | ;; Using iswitchb for other completion tasks. | 183 | ;; Using iswitchb for other completion tasks. |
| 184 | 184 | ||
| 185 | ;; Kin Cho (kin@neoscale.com) sent the following suggestion to use | 185 | ;; Kin Cho (kin@neoscale.com) sent the following suggestion to use |
| 186 | ;; iswitchb for other completion tasks. | 186 | ;; iswitchb for other completion tasks. |
| 187 | ;; | 187 | ;; |
| 188 | ;; (defun my-icompleting-read (prompt choices) | 188 | ;; (defun my-icompleting-read (prompt choices) |
| 189 | ;; "Use iswitch as a completing-read replacement to choose from | 189 | ;; "Use iswitch as a completing-read replacement to choose from |
| @@ -209,8 +209,8 @@ | |||
| 209 | ;; (delete-minibuffer-contents)) | 209 | ;; (delete-minibuffer-contents)) |
| 210 | ;; | 210 | ;; |
| 211 | ;; (add-hook 'iswitchb-define-mode-map-hook | 211 | ;; (add-hook 'iswitchb-define-mode-map-hook |
| 212 | ;; '(lambda () (define-key | 212 | ;; '(lambda () (define-key |
| 213 | ;; iswitchb-mode-map "\C-o" | 213 | ;; iswitchb-mode-map "\C-o" |
| 214 | ;; 'iswitchb-exclude-nonmatching))) | 214 | ;; 'iswitchb-exclude-nonmatching))) |
| 215 | 215 | ||
| 216 | ;; Other lisp packages extend iswitchb behaviour to other tasks. See | 216 | ;; Other lisp packages extend iswitchb behaviour to other tasks. See |
| @@ -518,7 +518,7 @@ variable `iswitchb-mode'." | |||
| 518 | (define-key map "\C-m" 'iswitchb-exit-minibuffer) | 518 | (define-key map "\C-m" 'iswitchb-exit-minibuffer) |
| 519 | (setq iswitchb-mode-map map) | 519 | (setq iswitchb-mode-map map) |
| 520 | (run-hooks 'iswitchb-define-mode-map-hook))) | 520 | (run-hooks 'iswitchb-define-mode-map-hook))) |
| 521 | 521 | ||
| 522 | ;;; MAIN FUNCTION | 522 | ;;; MAIN FUNCTION |
| 523 | (defun iswitchb () | 523 | (defun iswitchb () |
| 524 | "Switch to buffer matching a substring. | 524 | "Switch to buffer matching a substring. |
| @@ -547,7 +547,7 @@ in a separate window. | |||
| 547 | \\[iswitchb-kill-buffer] Kill buffer at head of buffer list." | 547 | \\[iswitchb-kill-buffer] Kill buffer at head of buffer list." |
| 548 | ;;\\[iswitchb-toggle-ignore] Toggle ignoring certain buffers (see \ | 548 | ;;\\[iswitchb-toggle-ignore] Toggle ignoring certain buffers (see \ |
| 549 | ;;`iswitchb-buffer-ignore') | 549 | ;;`iswitchb-buffer-ignore') |
| 550 | 550 | ||
| 551 | (let* ((prompt "iswitch ") | 551 | (let* ((prompt "iswitch ") |
| 552 | (buf (iswitchb-read-buffer prompt))) | 552 | (buf (iswitchb-read-buffer prompt))) |
| 553 | 553 | ||
| @@ -626,7 +626,7 @@ If REQUIRE-MATCH is non-nil, an existing-buffer must be selected." | |||
| 626 | (setq buf-sel iswitchb-final-text) | 626 | (setq buf-sel iswitchb-final-text) |
| 627 | ;; else take head of list | 627 | ;; else take head of list |
| 628 | (setq buf-sel (car iswitchb-matches))) | 628 | (setq buf-sel (car iswitchb-matches))) |
| 629 | 629 | ||
| 630 | ;; Or possibly choose the default buffer | 630 | ;; Or possibly choose the default buffer |
| 631 | (if (equal iswitchb-final-text "") | 631 | (if (equal iswitchb-final-text "") |
| 632 | (setq buf-sel | 632 | (setq buf-sel |
| @@ -661,11 +661,11 @@ The result is stored in `iswitchb-common-match-string'." | |||
| 661 | (let (res) | 661 | (let (res) |
| 662 | (cond ((not iswitchb-matches) | 662 | (cond ((not iswitchb-matches) |
| 663 | (run-hooks 'iswitchb-cannot-complete-hook)) | 663 | (run-hooks 'iswitchb-cannot-complete-hook)) |
| 664 | 664 | ||
| 665 | ((= 1 (length iswitchb-matches)) | 665 | ((= 1 (length iswitchb-matches)) |
| 666 | ;; only one choice, so select it. | 666 | ;; only one choice, so select it. |
| 667 | (exit-minibuffer)) | 667 | (exit-minibuffer)) |
| 668 | 668 | ||
| 669 | (t | 669 | (t |
| 670 | ;; else there could be some completions | 670 | ;; else there could be some completions |
| 671 | (setq res iswitchb-common-match-string) | 671 | (setq res iswitchb-common-match-string) |
| @@ -847,16 +847,16 @@ BUFFER-LIST can be list of buffers or list of strings." | |||
| 847 | ret) | 847 | ret) |
| 848 | (mapcar | 848 | (mapcar |
| 849 | (lambda (x) | 849 | (lambda (x) |
| 850 | 850 | ||
| 851 | (if do-string | 851 | (if do-string |
| 852 | (setq name x) ;We already have the name | 852 | (setq name x) ;We already have the name |
| 853 | (setq name (buffer-name x))) | 853 | (setq name (buffer-name x))) |
| 854 | 854 | ||
| 855 | (cond | 855 | (cond |
| 856 | ((and (or (and string-format (string-match regexp name)) | 856 | ((and (or (and string-format (string-match regexp name)) |
| 857 | (and (null string-format) | 857 | (and (null string-format) |
| 858 | (string-match (regexp-quote regexp) name))) | 858 | (string-match (regexp-quote regexp) name))) |
| 859 | 859 | ||
| 860 | (not (iswitchb-ignore-buffername-p name))) | 860 | (not (iswitchb-ignore-buffername-p name))) |
| 861 | (setq ret (cons name ret)) | 861 | (setq ret (cons name ret)) |
| 862 | ))) | 862 | ))) |
| @@ -954,10 +954,10 @@ Return the modified list with the last element prepended to it." | |||
| 954 | (set-window-start win (point-min)) | 954 | (set-window-start win (point-min)) |
| 955 | (scroll-other-window)) | 955 | (scroll-other-window)) |
| 956 | (set-buffer buf)) | 956 | (set-buffer buf)) |
| 957 | 957 | ||
| 958 | (with-output-to-temp-buffer temp-buf | 958 | (with-output-to-temp-buffer temp-buf |
| 959 | (if iswitchb-xemacs | 959 | (if iswitchb-xemacs |
| 960 | 960 | ||
| 961 | ;; XEmacs extents are put on by default, doesn't seem to be | 961 | ;; XEmacs extents are put on by default, doesn't seem to be |
| 962 | ;; any way of switching them off. | 962 | ;; any way of switching them off. |
| 963 | (display-completion-list (if iswitchb-matches | 963 | (display-completion-list (if iswitchb-matches |
| @@ -1043,7 +1043,7 @@ Return the modified list with the last element prepended to it." | |||
| 1043 | (if (and iswitchb-newbuffer | 1043 | (if (and iswitchb-newbuffer |
| 1044 | (or | 1044 | (or |
| 1045 | (not iswitchb-prompt-newbuffer) | 1045 | (not iswitchb-prompt-newbuffer) |
| 1046 | 1046 | ||
| 1047 | (and iswitchb-prompt-newbuffer | 1047 | (and iswitchb-prompt-newbuffer |
| 1048 | (y-or-n-p | 1048 | (y-or-n-p |
| 1049 | (format | 1049 | (format |
| @@ -1187,7 +1187,7 @@ Copied from `icomplete-exhibit' with two changes: | |||
| 1187 | (iswitchb-set-common-completion) | 1187 | (iswitchb-set-common-completion) |
| 1188 | 1188 | ||
| 1189 | ;; Insert the match-status information: | 1189 | ;; Insert the match-status information: |
| 1190 | (insert (iswitchb-completions | 1190 | (insert (iswitchb-completions |
| 1191 | contents | 1191 | contents |
| 1192 | minibuffer-completion-table | 1192 | minibuffer-completion-table |
| 1193 | minibuffer-completion-predicate | 1193 | minibuffer-completion-predicate |
| @@ -1196,7 +1196,7 @@ Copied from `icomplete-exhibit' with two changes: | |||
| 1196 | (defun iswitchb-completions (name candidates predicate require-match) | 1196 | (defun iswitchb-completions (name candidates predicate require-match) |
| 1197 | "Return the string that is displayed after the user's text. | 1197 | "Return the string that is displayed after the user's text. |
| 1198 | Modified from `icomplete-completions'." | 1198 | Modified from `icomplete-completions'." |
| 1199 | 1199 | ||
| 1200 | (let ((comps iswitchb-matches) | 1200 | (let ((comps iswitchb-matches) |
| 1201 | ; "-determined" - only one candidate | 1201 | ; "-determined" - only one candidate |
| 1202 | (open-bracket-determined (if require-match "(" "[")) | 1202 | (open-bracket-determined (if require-match "(" "[")) |
| @@ -1273,7 +1273,7 @@ Modified from `icomplete-completions'." | |||
| 1273 | (concat open-bracket-determined | 1273 | (concat open-bracket-determined |
| 1274 | (substring most (length name)) | 1274 | (substring most (length name)) |
| 1275 | close-bracket-determined)) | 1275 | close-bracket-determined)) |
| 1276 | 1276 | ||
| 1277 | ;; list all alternatives | 1277 | ;; list all alternatives |
| 1278 | open-bracket-prospects | 1278 | open-bracket-prospects |
| 1279 | (if most-is-exact | 1279 | (if most-is-exact |
| @@ -1304,13 +1304,13 @@ Copied from `icomplete-tidy'." | |||
| 1304 | 1304 | ||
| 1305 | (if (and (boundp 'iswitchb-eoinput) | 1305 | (if (and (boundp 'iswitchb-eoinput) |
| 1306 | iswitchb-eoinput) | 1306 | iswitchb-eoinput) |
| 1307 | 1307 | ||
| 1308 | (if (> iswitchb-eoinput (point-max)) | 1308 | (if (> iswitchb-eoinput (point-max)) |
| 1309 | ;; Oops, got rug pulled out from under us - reinit: | 1309 | ;; Oops, got rug pulled out from under us - reinit: |
| 1310 | (setq iswitchb-eoinput (point-max)) | 1310 | (setq iswitchb-eoinput (point-max)) |
| 1311 | (let ((buffer-undo-list buffer-undo-list )) ; prevent entry | 1311 | (let ((buffer-undo-list buffer-undo-list )) ; prevent entry |
| 1312 | (delete-region iswitchb-eoinput (point-max)))) | 1312 | (delete-region iswitchb-eoinput (point-max)))) |
| 1313 | 1313 | ||
| 1314 | ;; Reestablish the local variable 'cause minibuffer-setup is weird: | 1314 | ;; Reestablish the local variable 'cause minibuffer-setup is weird: |
| 1315 | (make-local-variable 'iswitchb-eoinput) | 1315 | (make-local-variable 'iswitchb-eoinput) |
| 1316 | (setq iswitchb-eoinput 1))) | 1316 | (setq iswitchb-eoinput 1))) |
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index 2f832bf3dad..b143393c867 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | (progn ,@body) | 38 | (progn ,@body) |
| 39 | (unless ,modified | 39 | (unless ,modified |
| 40 | (restore-buffer-modified-p nil)))))) | 40 | (restore-buffer-modified-p nil)))))) |
| 41 | 41 | ||
| 42 | (defmacro with-buffer-prepared-for-jit-lock (&rest body) | 42 | (defmacro with-buffer-prepared-for-jit-lock (&rest body) |
| 43 | "Execute BODY in current buffer, overriding several variables. | 43 | "Execute BODY in current buffer, overriding several variables. |
| 44 | Preserves the `buffer-modified-p' state of the current buffer." | 44 | Preserves the `buffer-modified-p' state of the current buffer." |
| @@ -52,7 +52,7 @@ Preserves the `buffer-modified-p' state of the current buffer." | |||
| 52 | buffer-file-truename) | 52 | buffer-file-truename) |
| 53 | ,@body)))) | 53 | ,@body)))) |
| 54 | 54 | ||
| 55 | 55 | ||
| 56 | 56 | ||
| 57 | ;;; Customization. | 57 | ;;; Customization. |
| 58 | 58 | ||
| @@ -82,9 +82,9 @@ To reduce machine load during stealth fontification, at the cost of stealth | |||
| 82 | taking longer to fontify, you could increase the value of this variable. | 82 | taking longer to fontify, you could increase the value of this variable. |
| 83 | See also `jit-lock-stealth-load'." | 83 | See also `jit-lock-stealth-load'." |
| 84 | :type '(choice (const :tag "never" nil) | 84 | :type '(choice (const :tag "never" nil) |
| 85 | (number :tag "seconds")) | 85 | (number :tag "seconds")) |
| 86 | :group 'jit-lock) | 86 | :group 'jit-lock) |
| 87 | 87 | ||
| 88 | 88 | ||
| 89 | (defcustom jit-lock-stealth-load | 89 | (defcustom jit-lock-stealth-load |
| 90 | (if (condition-case nil (load-average) (error)) 200) | 90 | (if (condition-case nil (load-average) (error)) 200) |
| @@ -325,7 +325,7 @@ Defaults to the whole buffer. END can be out of bounds." | |||
| 325 | ;; stop at the start of the line following NEXT. | 325 | ;; stop at the start of the line following NEXT. |
| 326 | (goto-char next) (setq next (line-beginning-position 2)) | 326 | (goto-char next) (setq next (line-beginning-position 2)) |
| 327 | (goto-char start) (setq start (line-beginning-position)) | 327 | (goto-char start) (setq start (line-beginning-position)) |
| 328 | 328 | ||
| 329 | ;; Fontify the chunk, and mark it as fontified. | 329 | ;; Fontify the chunk, and mark it as fontified. |
| 330 | ;; We mark it first, to make sure that we don't indefinitely | 330 | ;; We mark it first, to make sure that we don't indefinitely |
| 331 | ;; re-execute this fontification if an error occurs. | 331 | ;; re-execute this fontification if an error occurs. |
| @@ -378,7 +378,7 @@ Value is nil if there is nothing more to fontify." | |||
| 378 | ((< (- around start) (- next around)) start) | 378 | ((< (- around start) (- next around)) start) |
| 379 | (t next)))) | 379 | (t next)))) |
| 380 | result)))) | 380 | result)))) |
| 381 | 381 | ||
| 382 | 382 | ||
| 383 | (defun jit-lock-stealth-fontify () | 383 | (defun jit-lock-stealth-fontify () |
| 384 | "Fontify buffers stealthily. | 384 | "Fontify buffers stealthily. |
| @@ -393,7 +393,7 @@ This functions is called after Emacs has been idle for | |||
| 393 | (while (and buffers (not (input-pending-p))) | 393 | (while (and buffers (not (input-pending-p))) |
| 394 | (let ((buffer (car buffers))) | 394 | (let ((buffer (car buffers))) |
| 395 | (setq buffers (cdr buffers)) | 395 | (setq buffers (cdr buffers)) |
| 396 | 396 | ||
| 397 | (with-current-buffer buffer | 397 | (with-current-buffer buffer |
| 398 | (when jit-lock-mode | 398 | (when jit-lock-mode |
| 399 | ;; This is funny. Calling sit-for with 3rd arg non-nil | 399 | ;; This is funny. Calling sit-for with 3rd arg non-nil |
| @@ -447,14 +447,14 @@ This functions is called after Emacs has been idle for | |||
| 447 | (while (and (setq start | 447 | (while (and (setq start |
| 448 | (jit-lock-stealth-chunk-start point)) | 448 | (jit-lock-stealth-chunk-start point)) |
| 449 | (sit-for nice)) | 449 | (sit-for nice)) |
| 450 | 450 | ||
| 451 | ;; fontify a block. | 451 | ;; fontify a block. |
| 452 | (jit-lock-fontify-now start (+ start jit-lock-chunk-size)) | 452 | (jit-lock-fontify-now start (+ start jit-lock-chunk-size)) |
| 453 | ;; If stealth jit-locking is done backwards, this leads to | 453 | ;; If stealth jit-locking is done backwards, this leads to |
| 454 | ;; excessive O(n^2) refontification. -stef | 454 | ;; excessive O(n^2) refontification. -stef |
| 455 | ;; (when (>= jit-lock-first-unfontify-pos start) | 455 | ;; (when (>= jit-lock-first-unfontify-pos start) |
| 456 | ;; (setq jit-lock-first-unfontify-pos end)) | 456 | ;; (setq jit-lock-first-unfontify-pos end)) |
| 457 | 457 | ||
| 458 | ;; Wait a little if load is too high. | 458 | ;; Wait a little if load is too high. |
| 459 | (when (and jit-lock-stealth-load | 459 | (when (and jit-lock-stealth-load |
| 460 | (> (car (load-average)) jit-lock-stealth-load)) | 460 | (> (car (load-average)) jit-lock-stealth-load)) |
| @@ -489,7 +489,7 @@ This functions is called after Emacs has been idle for | |||
| 489 | (sit-for 0) | 489 | (sit-for 0) |
| 490 | ;; (message "Jit-Defer Done") | 490 | ;; (message "Jit-Defer Done") |
| 491 | ))) | 491 | ))) |
| 492 | 492 | ||
| 493 | 493 | ||
| 494 | (defun jit-lock-after-change (start end old-len) | 494 | (defun jit-lock-after-change (start end old-len) |
| 495 | "Mark the rest of the buffer as not fontified after a change. | 495 | "Mark the rest of the buffer as not fontified after a change. |
| @@ -508,7 +508,7 @@ will take place when text is fontified stealthily." | |||
| 508 | ;; be inconsistent with the buffer's content. | 508 | ;; be inconsistent with the buffer's content. |
| 509 | (goto-char start) | 509 | (goto-char start) |
| 510 | (setq start (line-beginning-position)) | 510 | (setq start (line-beginning-position)) |
| 511 | 511 | ||
| 512 | ;; If we're in text that matches a multi-line font-lock pattern, | 512 | ;; If we're in text that matches a multi-line font-lock pattern, |
| 513 | ;; make sure the whole text will be redisplayed. | 513 | ;; make sure the whole text will be redisplayed. |
| 514 | ;; I'm not sure this is ever necessary and/or sufficient. -stef | 514 | ;; I'm not sure this is ever necessary and/or sufficient. -stef |
| @@ -516,7 +516,7 @@ will take place when text is fontified stealthily." | |||
| 516 | (setq start (or (previous-single-property-change | 516 | (setq start (or (previous-single-property-change |
| 517 | start 'font-lock-multiline) | 517 | start 'font-lock-multiline) |
| 518 | (point-min)))) | 518 | (point-min)))) |
| 519 | 519 | ||
| 520 | ;; Make sure we change at least one char (in case of deletions). | 520 | ;; Make sure we change at least one char (in case of deletions). |
| 521 | (setq end (min (max end (1+ start)) (point-max))) | 521 | (setq end (min (max end (1+ start)) (point-max))) |
| 522 | ;; Request refontification. | 522 | ;; Request refontification. |
| @@ -525,7 +525,7 @@ will take place when text is fontified stealthily." | |||
| 525 | (when jit-lock-first-unfontify-pos | 525 | (when jit-lock-first-unfontify-pos |
| 526 | (setq jit-lock-first-unfontify-pos | 526 | (setq jit-lock-first-unfontify-pos |
| 527 | (min jit-lock-first-unfontify-pos start)))))) | 527 | (min jit-lock-first-unfontify-pos start)))))) |
| 528 | 528 | ||
| 529 | (provide 'jit-lock) | 529 | (provide 'jit-lock) |
| 530 | 530 | ||
| 531 | ;;; jit-lock.el ends here | 531 | ;;; jit-lock.el ends here |
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index e1780b33296..7a51e961ed0 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el | |||
| @@ -77,9 +77,9 @@ | |||
| 77 | 77 | ||
| 78 | 78 | ||
| 79 | ;; ACKNOWLEDGMENTS | 79 | ;; ACKNOWLEDGMENTS |
| 80 | ;; | 80 | ;; |
| 81 | ;; jka-compr is a V19 adaptation of jka-compr for V18 of Emacs. Many people | 81 | ;; jka-compr is a V19 adaptation of jka-compr for V18 of Emacs. Many people |
| 82 | ;; have made helpful suggestions, reported bugs, and even fixed bugs in | 82 | ;; have made helpful suggestions, reported bugs, and even fixed bugs in |
| 83 | ;; jka-compr. I recall the following people as being particularly helpful. | 83 | ;; jka-compr. I recall the following people as being particularly helpful. |
| 84 | ;; | 84 | ;; |
| 85 | ;; Jean-loup Gailly | 85 | ;; Jean-loup Gailly |
| @@ -117,7 +117,7 @@ for `jka-compr-compression-info-list')." | |||
| 117 | :type 'string | 117 | :type 'string |
| 118 | :group 'jka-compr) | 118 | :group 'jka-compr) |
| 119 | 119 | ||
| 120 | (defvar jka-compr-use-shell | 120 | (defvar jka-compr-use-shell |
| 121 | (not (memq system-type '(ms-dos windows-nt)))) | 121 | (not (memq system-type '(ms-dos windows-nt)))) |
| 122 | 122 | ||
| 123 | ;;; I have this defined so that .Z files are assumed to be in unix | 123 | ;;; I have this defined so that .Z files are assumed to be in unix |
| @@ -270,8 +270,8 @@ based on the filename itself and `jka-compr-compression-info-list'." | |||
| 270 | 270 | ||
| 271 | (signal 'compression-error | 271 | (signal 'compression-error |
| 272 | (list "Opening input file" (format "error %s" message) infile))) | 272 | (list "Opening input file" (format "error %s" message) infile))) |
| 273 | 273 | ||
| 274 | 274 | ||
| 275 | (defcustom jka-compr-dd-program "/bin/dd" | 275 | (defcustom jka-compr-dd-program "/bin/dd" |
| 276 | "How to invoke `dd'." | 276 | "How to invoke `dd'." |
| 277 | :type 'string | 277 | :type 'string |
| @@ -447,7 +447,7 @@ There should be no more than seven characters after the final `/'." | |||
| 447 | 447 | ||
| 448 | (setq temp-file (jka-compr-make-temp-name))) | 448 | (setq temp-file (jka-compr-make-temp-name))) |
| 449 | 449 | ||
| 450 | (and | 450 | (and |
| 451 | compress-message | 451 | compress-message |
| 452 | (message "%s %s..." compress-message base-name)) | 452 | (message "%s %s..." compress-message base-name)) |
| 453 | 453 | ||
| @@ -502,7 +502,7 @@ There should be no more than seven characters after the final `/'." | |||
| 502 | (setq last-coding-system-used coding-system-used) | 502 | (setq last-coding-system-used coding-system-used) |
| 503 | 503 | ||
| 504 | nil) | 504 | nil) |
| 505 | 505 | ||
| 506 | (jka-compr-run-real-handler 'write-region | 506 | (jka-compr-run-real-handler 'write-region |
| 507 | (list start end filename append visit))))) | 507 | (list start end filename append visit))))) |
| 508 | 508 | ||
| @@ -538,7 +538,7 @@ There should be no more than seven characters after the final `/'." | |||
| 538 | (unwind-protect ; to make sure local-copy gets deleted | 538 | (unwind-protect ; to make sure local-copy gets deleted |
| 539 | 539 | ||
| 540 | (progn | 540 | (progn |
| 541 | 541 | ||
| 542 | (and | 542 | (and |
| 543 | uncompress-message | 543 | uncompress-message |
| 544 | (message "%s %s..." uncompress-message base-name)) | 544 | (message "%s %s..." uncompress-message base-name)) |
| @@ -583,7 +583,7 @@ There should be no more than seven characters after the final `/'." | |||
| 583 | (eq (nth 3 error-code) local-file)) | 583 | (eq (nth 3 error-code) local-file)) |
| 584 | (if visit | 584 | (if visit |
| 585 | (setq notfound error-code) | 585 | (setq notfound error-code) |
| 586 | (signal 'file-error | 586 | (signal 'file-error |
| 587 | (cons "Opening input file" | 587 | (cons "Opening input file" |
| 588 | (nthcdr 2 error-code)))) | 588 | (nthcdr 2 error-code)))) |
| 589 | (signal (car error-code) (cdr error-code)))))) | 589 | (signal (car error-code) (cdr error-code)))))) |
| @@ -594,7 +594,7 @@ There should be no more than seven characters after the final `/'." | |||
| 594 | (delete-file local-copy))) | 594 | (delete-file local-copy))) |
| 595 | 595 | ||
| 596 | (decode-coding-inserted-region | 596 | (decode-coding-inserted-region |
| 597 | (point) (+ (point) size) | 597 | (point) (+ (point) size) |
| 598 | (jka-compr-byte-compiler-base-file-name file) | 598 | (jka-compr-byte-compiler-base-file-name file) |
| 599 | visit beg end replace) | 599 | visit beg end replace) |
| 600 | 600 | ||
| @@ -605,7 +605,7 @@ There should be no more than seven characters after the final `/'." | |||
| 605 | (setq buffer-file-name filename) | 605 | (setq buffer-file-name filename) |
| 606 | (setq jka-compr-really-do-compress t) | 606 | (setq jka-compr-really-do-compress t) |
| 607 | (set-visited-file-modtime))) | 607 | (set-visited-file-modtime))) |
| 608 | 608 | ||
| 609 | (and | 609 | (and |
| 610 | uncompress-message | 610 | uncompress-message |
| 611 | (message "%s %s...done" uncompress-message base-name)) | 611 | (message "%s %s...done" uncompress-message base-name)) |
| @@ -661,11 +661,11 @@ There should be no more than seven characters after the final `/'." | |||
| 661 | (unwind-protect | 661 | (unwind-protect |
| 662 | 662 | ||
| 663 | (with-current-buffer temp-buffer | 663 | (with-current-buffer temp-buffer |
| 664 | 664 | ||
| 665 | (and | 665 | (and |
| 666 | uncompress-message | 666 | uncompress-message |
| 667 | (message "%s %s..." uncompress-message base-name)) | 667 | (message "%s %s..." uncompress-message base-name)) |
| 668 | 668 | ||
| 669 | ;; Here we must read the output of uncompress program | 669 | ;; Here we must read the output of uncompress program |
| 670 | ;; and write it to TEMP-FILE without any code | 670 | ;; and write it to TEMP-FILE without any code |
| 671 | ;; conversion. An appropriate code conversion (if | 671 | ;; conversion. An appropriate code conversion (if |
| @@ -697,7 +697,7 @@ There should be no more than seven characters after the final `/'." | |||
| 697 | (kill-buffer temp-buffer)) | 697 | (kill-buffer temp-buffer)) |
| 698 | 698 | ||
| 699 | temp-file) | 699 | temp-file) |
| 700 | 700 | ||
| 701 | (jka-compr-run-real-handler 'file-local-copy (list filename))))) | 701 | (jka-compr-run-real-handler 'file-local-copy (list filename))))) |
| 702 | 702 | ||
| 703 | 703 | ||
| @@ -865,7 +865,7 @@ by `jka-compr-installed'." | |||
| 865 | (eq (nth 2 entry) 'jka-compr))) | 865 | (eq (nth 2 entry) 'jka-compr))) |
| 866 | (setcdr last (cdr (cdr last))) | 866 | (setcdr last (cdr (cdr last))) |
| 867 | (setq last (cdr last)))) | 867 | (setq last (cdr last)))) |
| 868 | 868 | ||
| 869 | (setq auto-mode-alist (cdr ama))) | 869 | (setq auto-mode-alist (cdr ama))) |
| 870 | 870 | ||
| 871 | (let* ((ama (cons nil file-coding-system-alist)) | 871 | (let* ((ama (cons nil file-coding-system-alist)) |
| @@ -877,7 +877,7 @@ by `jka-compr-installed'." | |||
| 877 | (if (member entry jka-compr-added-to-file-coding-system-alist) | 877 | (if (member entry jka-compr-added-to-file-coding-system-alist) |
| 878 | (setcdr last (cdr (cdr last))) | 878 | (setcdr last (cdr (cdr last))) |
| 879 | (setq last (cdr last)))) | 879 | (setq last (cdr last)))) |
| 880 | 880 | ||
| 881 | (setq file-coding-system-alist (cdr ama))) | 881 | (setq file-coding-system-alist (cdr ama))) |
| 882 | 882 | ||
| 883 | ;; Remove the suffixes that were added by jka-compr. | 883 | ;; Remove the suffixes that were added by jka-compr. |
| @@ -888,7 +888,7 @@ by `jka-compr-installed'." | |||
| 888 | (push suffix suffixes))) | 888 | (push suffix suffixes))) |
| 889 | (setq load-suffixes (nreverse suffixes)))) | 889 | (setq load-suffixes (nreverse suffixes)))) |
| 890 | 890 | ||
| 891 | 891 | ||
| 892 | (defun jka-compr-installed-p () | 892 | (defun jka-compr-installed-p () |
| 893 | "Return non-nil if jka-compr is installed. | 893 | "Return non-nil if jka-compr is installed. |
| 894 | The return value is the entry in `file-name-handler-alist' for jka-compr." | 894 | The return value is the entry in `file-name-handler-alist' for jka-compr." |
diff --git a/lisp/kermit.el b/lisp/kermit.el index ee4f0d54480..a11163133ba 100644 --- a/lisp/kermit.el +++ b/lisp/kermit.el | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | ;; ^C^Q^C to send an interrupt, and ^C^Q^Z for a stop signal, etc. (since ^C^C | 54 | ;; ^C^Q^C to send an interrupt, and ^C^Q^Z for a stop signal, etc. (since ^C^C |
| 55 | ;; just generates a local stop signal, which kermit ignores). | 55 | ;; just generates a local stop signal, which kermit ignores). |
| 56 | ;; To connect to a VMS system, I use a shell script to invoke kermit thru the | 56 | ;; To connect to a VMS system, I use a shell script to invoke kermit thru the |
| 57 | ;; tr filter, do "M-X kermit-send-cr", and then tell VMS that I'm on a | 57 | ;; tr filter, do "M-X kermit-send-cr", and then tell VMS that I'm on a |
| 58 | ;; half-duplex terminal. | 58 | ;; half-duplex terminal. |
| 59 | 59 | ||
| 60 | ;; Some caveats: | 60 | ;; Some caveats: |
| @@ -84,14 +84,14 @@ | |||
| 84 | (defun kermit-esc () | 84 | (defun kermit-esc () |
| 85 | "For sending escape sequences to a kermit running in shell mode." | 85 | "For sending escape sequences to a kermit running in shell mode." |
| 86 | (interactive) | 86 | (interactive) |
| 87 | (process-send-string | 87 | (process-send-string |
| 88 | (get-buffer-process (current-buffer)) | 88 | (get-buffer-process (current-buffer)) |
| 89 | (concat kermit-esc-char (char-to-string (read-char))))) | 89 | (concat kermit-esc-char (char-to-string (read-char))))) |
| 90 | 90 | ||
| 91 | (defun kermit-send-char () | 91 | (defun kermit-send-char () |
| 92 | "Send an arbitrary character to a program in shell mode." | 92 | "Send an arbitrary character to a program in shell mode." |
| 93 | (interactive) | 93 | (interactive) |
| 94 | (process-send-string | 94 | (process-send-string |
| 95 | (get-buffer-process (current-buffer)) | 95 | (get-buffer-process (current-buffer)) |
| 96 | (char-to-string (read-char)))) | 96 | (char-to-string (read-char)))) |
| 97 | 97 | ||
diff --git a/lisp/kmacro.el b/lisp/kmacro.el index 4b890f206ca..db7b6b1fe9b 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el | |||
| @@ -94,7 +94,7 @@ | |||
| 94 | ;; and you can set the macro counter format with C-x C-k C-f. | 94 | ;; and you can set the macro counter format with C-x C-k C-f. |
| 95 | 95 | ||
| 96 | ;; The following key bindings are performed: | 96 | ;; The following key bindings are performed: |
| 97 | ;; | 97 | ;; |
| 98 | ;; Normal While defining macro | 98 | ;; Normal While defining macro |
| 99 | ;; --------------------------- ------------------------------ | 99 | ;; --------------------------- ------------------------------ |
| 100 | ;; f3 Define macro Insert current counter value | 100 | ;; f3 Define macro Insert current counter value |
| @@ -102,13 +102,13 @@ | |||
| 102 | ;; counter value (default 0) (default increment: 1) | 102 | ;; counter value (default 0) (default increment: 1) |
| 103 | ;; | 103 | ;; |
| 104 | ;; C-u f3 APPENDs to last macro | 104 | ;; C-u f3 APPENDs to last macro |
| 105 | ;; | 105 | ;; |
| 106 | ;; f4 Call last macro End macro | 106 | ;; f4 Call last macro End macro |
| 107 | ;; Prefix arg specifies number | 107 | ;; Prefix arg specifies number |
| 108 | ;; of times to execute macro. | 108 | ;; of times to execute macro. |
| 109 | ;; | 109 | ;; |
| 110 | ;; C-u f4 Swap last and head of macro ring. | 110 | ;; C-u f4 Swap last and head of macro ring. |
| 111 | ;; | 111 | ;; |
| 112 | ;; S-mouse-3 Set point at click and End macro and execute macro at | 112 | ;; S-mouse-3 Set point at click and End macro and execute macro at |
| 113 | ;; execute last macro. click. | 113 | ;; execute last macro. click. |
| 114 | 114 | ||
| @@ -339,7 +339,7 @@ Non-nil arg RAW means just return raw first element." | |||
| 339 | Non-nil arg RAW means just return raw first element." | 339 | Non-nil arg RAW means just return raw first element." |
| 340 | (unless (kmacro-ring-empty-p) | 340 | (unless (kmacro-ring-empty-p) |
| 341 | (kmacro-pop-ring1 raw))) | 341 | (kmacro-pop-ring1 raw))) |
| 342 | 342 | ||
| 343 | 343 | ||
| 344 | (defun kmacro-ring-length () | 344 | (defun kmacro-ring-length () |
| 345 | "Return length of macro ring, including pseudo head." | 345 | "Return length of macro ring, including pseudo head." |
| @@ -368,7 +368,7 @@ Check only `last-kbd-macro' if optional arg NONE is non-nil." | |||
| 368 | (m (format-kbd-macro macro)) | 368 | (m (format-kbd-macro macro)) |
| 369 | (l (length m)) | 369 | (l (length m)) |
| 370 | (z (and nil trunc (> l x)))) | 370 | (z (and nil trunc (> l x)))) |
| 371 | (message (format "%s: %s%s" (or descr "Macro") | 371 | (message (format "%s: %s%s" (or descr "Macro") |
| 372 | (if z (substring m 0 (1- x)) m) (if z "..." "")))) | 372 | (if z (substring m 0 (1- x)) m) (if z "..." "")))) |
| 373 | (message (or empty "No keyboard macros defined")))) | 373 | (message (or empty "No keyboard macros defined")))) |
| 374 | 374 | ||
| @@ -439,7 +439,7 @@ Check only `last-kbd-macro' if optional arg NONE is non-nil." | |||
| 439 | (kmacro-display (car (car kmacro-ring)) "2nd macro"))) | 439 | (kmacro-display (car (car kmacro-ring)) "2nd macro"))) |
| 440 | 440 | ||
| 441 | 441 | ||
| 442 | 442 | ||
| 443 | (defun kmacro-cycle-ring-next (&optional arg) | 443 | (defun kmacro-cycle-ring-next (&optional arg) |
| 444 | "Move to next keyboard macro in keyboard macro ring. | 444 | "Move to next keyboard macro in keyboard macro ring. |
| 445 | Displays the selected macro in the echo area." | 445 | Displays the selected macro in the echo area." |
| @@ -500,7 +500,7 @@ Displays the selected macro in the echo area." | |||
| 500 | 500 | ||
| 501 | ;;; Traditional bindings: | 501 | ;;; Traditional bindings: |
| 502 | 502 | ||
| 503 | 503 | ||
| 504 | ;;;###autoload | 504 | ;;;###autoload |
| 505 | (defun kmacro-start-macro (arg) | 505 | (defun kmacro-start-macro (arg) |
| 506 | "Record subsequent keyboard input, defining a keyboard macro. | 506 | "Record subsequent keyboard input, defining a keyboard macro. |
| @@ -527,7 +527,7 @@ The format of the counter can be modified via \\[kmacro-set-format]." | |||
| 527 | (unless append | 527 | (unless append |
| 528 | (if last-kbd-macro | 528 | (if last-kbd-macro |
| 529 | (let ((len (length kmacro-ring))) | 529 | (let ((len (length kmacro-ring))) |
| 530 | (setq kmacro-ring | 530 | (setq kmacro-ring |
| 531 | (cons | 531 | (cons |
| 532 | (list last-kbd-macro kmacro-counter kmacro-counter-format-start) | 532 | (list last-kbd-macro kmacro-counter kmacro-counter-format-start) |
| 533 | kmacro-ring)) | 533 | kmacro-ring)) |
| @@ -538,7 +538,7 @@ The format of the counter can be modified via \\[kmacro-set-format]." | |||
| 538 | kmacro-last-counter kmacro-counter | 538 | kmacro-last-counter kmacro-counter |
| 539 | kmacro-counter-format-start kmacro-counter-format)) | 539 | kmacro-counter-format-start kmacro-counter-format)) |
| 540 | 540 | ||
| 541 | (start-kbd-macro append | 541 | (start-kbd-macro append |
| 542 | (and append | 542 | (and append |
| 543 | (if kmacro-execute-before-append | 543 | (if kmacro-execute-before-append |
| 544 | (> (car arg) 4) | 544 | (> (car arg) 4) |
| @@ -592,7 +592,7 @@ others, use M-x name-last-kbd-macro." | |||
| 592 | kmacro-call-repeat-key))) | 592 | kmacro-call-repeat-key))) |
| 593 | (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil)) | 593 | (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil)) |
| 594 | (while repeat-key | 594 | (while repeat-key |
| 595 | (message "(Type %s to repeat macro%s)" | 595 | (message "(Type %s to repeat macro%s)" |
| 596 | repeat-key-str | 596 | repeat-key-str |
| 597 | (if (and kmacro-call-repeat-with-arg | 597 | (if (and kmacro-call-repeat-with-arg |
| 598 | arg (> arg 1)) | 598 | arg (> arg 1)) |
| @@ -640,7 +640,7 @@ The format of the counter can be modified via \\[kmacro-set-format]." | |||
| 640 | With numeric prefix ARG, repeat macro that many times. | 640 | With numeric prefix ARG, repeat macro that many times. |
| 641 | With \\[universal-argument], call second macro in macro ring." | 641 | With \\[universal-argument], call second macro in macro ring." |
| 642 | (interactive "P") | 642 | (interactive "P") |
| 643 | (cond | 643 | (cond |
| 644 | (defining-kbd-macro | 644 | (defining-kbd-macro |
| 645 | (if kmacro-call-repeat-key | 645 | (if kmacro-call-repeat-key |
| 646 | (kmacro-call-macro arg no-repeat t) | 646 | (kmacro-call-macro arg no-repeat t) |
| @@ -796,7 +796,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', | |||
| 796 | (format "Macro: %s%s%s%s%s\n" | 796 | (format "Macro: %s%s%s%s%s\n" |
| 797 | (format-kbd-macro kmacro-step-edit-new-macro 1) | 797 | (format-kbd-macro kmacro-step-edit-new-macro 1) |
| 798 | (if (and kmacro-step-edit-new-macro (> (length kmacro-step-edit-new-macro) 0)) " " "") | 798 | (if (and kmacro-step-edit-new-macro (> (length kmacro-step-edit-new-macro) 0)) " " "") |
| 799 | (propertize (if keys (format-kbd-macro keys) | 799 | (propertize (if keys (format-kbd-macro keys) |
| 800 | (if kmacro-step-edit-appending "<APPEND>" "<INSERT>")) 'face 'region) | 800 | (if kmacro-step-edit-appending "<APPEND>" "<INSERT>")) 'face 'region) |
| 801 | (if future " " "") | 801 | (if future " " "") |
| 802 | (if future (format-kbd-macro future) "")) | 802 | (if future (format-kbd-macro future) "")) |
| @@ -813,7 +813,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', | |||
| 813 | curmsg)) | 813 | curmsg)) |
| 814 | (t "")) | 814 | (t "")) |
| 815 | (if keys | 815 | (if keys |
| 816 | (format "%s\n%s%s %S [yn iIaArR C-k kq!] " | 816 | (format "%s\n%s%s %S [yn iIaArR C-k kq!] " |
| 817 | (propertize "\ | 817 | (propertize "\ |
| 818 | --------------Step Edit Keyboard Macro [?: help]---------------" 'face 'mode-line) | 818 | --------------Step Edit Keyboard Macro [?: help]---------------" 'face 'mode-line) |
| 819 | (if kmacro-step-edit-help "\ | 819 | (if kmacro-step-edit-help "\ |
| @@ -826,7 +826,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', | |||
| 826 | " "") | 826 | " "") |
| 827 | (propertize "Next command:" 'face 'bold) | 827 | (propertize "Next command:" 'face 'bold) |
| 828 | this-command) | 828 | this-command) |
| 829 | (propertize | 829 | (propertize |
| 830 | (format "Type key sequence%s to insert and execute%s: " | 830 | (format "Type key sequence%s to insert and execute%s: " |
| 831 | (if (numberp kmacro-step-edit-inserting) "" "s") | 831 | (if (numberp kmacro-step-edit-inserting) "" "s") |
| 832 | (if (numberp kmacro-step-edit-inserting) "" " (end with C-j)")) | 832 | (if (numberp kmacro-step-edit-inserting) "" " (end with C-j)")) |
| @@ -864,7 +864,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', | |||
| 864 | (clear-this-command-keys) ;; recent-keys actually | 864 | (clear-this-command-keys) ;; recent-keys actually |
| 865 | (let (unread-command-events) | 865 | (let (unread-command-events) |
| 866 | (quoted-insert (prefix-numeric-value current-prefix-arg)) | 866 | (quoted-insert (prefix-numeric-value current-prefix-arg)) |
| 867 | (setq kmacro-step-edit-new-macro | 867 | (setq kmacro-step-edit-new-macro |
| 868 | (vconcat kmacro-step-edit-new-macro (recent-keys))) | 868 | (vconcat kmacro-step-edit-new-macro (recent-keys))) |
| 869 | (when unread-command-events | 869 | (when unread-command-events |
| 870 | (setq kmacro-step-edit-new-macro | 870 | (setq kmacro-step-edit-new-macro |
| @@ -957,7 +957,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', | |||
| 957 | (if (> executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) | 957 | (if (> executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) |
| 958 | (setq kmacro-step-edit-new-macro | 958 | (setq kmacro-step-edit-new-macro |
| 959 | (vconcat kmacro-step-edit-new-macro | 959 | (vconcat kmacro-step-edit-new-macro |
| 960 | (substring executing-kbd-macro | 960 | (substring executing-kbd-macro |
| 961 | (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index) | 961 | (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index) |
| 962 | (if (eq act t) nil executing-macro-index))) | 962 | (if (eq act t) nil executing-macro-index))) |
| 963 | kmacro-step-edit-prefix-index nil)) | 963 | kmacro-step-edit-prefix-index nil)) |
| @@ -1068,7 +1068,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', | |||
| 1068 | (add-hook 'pre-command-hook 'kmacro-step-edit-pre-command nil nil) | 1068 | (add-hook 'pre-command-hook 'kmacro-step-edit-pre-command nil nil) |
| 1069 | (if kmacro-step-edit-key-index | 1069 | (if kmacro-step-edit-key-index |
| 1070 | (setq executing-macro-index kmacro-step-edit-key-index) | 1070 | (setq executing-macro-index kmacro-step-edit-key-index) |
| 1071 | (setq kmacro-step-edit-key-index executing-macro-index)))) | 1071 | (setq kmacro-step-edit-key-index executing-macro-index)))) |
| 1072 | 1072 | ||
| 1073 | 1073 | ||
| 1074 | (defun kmacro-step-edit-macro () | 1074 | (defun kmacro-step-edit-macro () |
diff --git a/lisp/lazy-lock.el b/lisp/lazy-lock.el index 11303dfbd92..b335fb84058 100644 --- a/lisp/lazy-lock.el +++ b/lisp/lazy-lock.el | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | ;; See also the fast-lock package. (But don't use them at the same time!) | 38 | ;; See also the fast-lock package. (But don't use them at the same time!) |
| 39 | 39 | ||
| 40 | ;; Installation: | 40 | ;; Installation: |
| 41 | ;; | 41 | ;; |
| 42 | ;; Put in your ~/.emacs: | 42 | ;; Put in your ~/.emacs: |
| 43 | ;; | 43 | ;; |
| 44 | ;; (setq font-lock-support-mode 'lazy-lock-mode) | 44 | ;; (setq font-lock-support-mode 'lazy-lock-mode) |
| @@ -449,7 +449,7 @@ To reduce machine load during stealth fontification, at the cost of stealth | |||
| 449 | taking longer to fontify, you could increase the value of this variable. | 449 | taking longer to fontify, you could increase the value of this variable. |
| 450 | See also `lazy-lock-stealth-load'." | 450 | See also `lazy-lock-stealth-load'." |
| 451 | :type '(choice (const :tag "never" nil) | 451 | :type '(choice (const :tag "never" nil) |
| 452 | (number :tag "seconds")) | 452 | (number :tag "seconds")) |
| 453 | :group 'lazy-lock) | 453 | :group 'lazy-lock) |
| 454 | 454 | ||
| 455 | (defcustom lazy-lock-stealth-verbose | 455 | (defcustom lazy-lock-stealth-verbose |
diff --git a/lisp/locate.el b/lisp/locate.el index c467665a8e5..40e8ddc65c3 100644 --- a/lisp/locate.el +++ b/lisp/locate.el | |||
| @@ -200,7 +200,7 @@ With prefix arg, prompt for the locate command to run." | |||
| 200 | (+ 2 (length (car locate-cmd)))) | 200 | (+ 2 (length (car locate-cmd)))) |
| 201 | nil nil 'locate-history-list)) | 201 | nil nil 'locate-history-list)) |
| 202 | (let* ((default (locate-word-at-point)) | 202 | (let* ((default (locate-word-at-point)) |
| 203 | (input | 203 | (input |
| 204 | (read-from-minibuffer | 204 | (read-from-minibuffer |
| 205 | (if (> (length default) 0) | 205 | (if (> (length default) 0) |
| 206 | (format "Locate (default `%s'): " default) | 206 | (format "Locate (default `%s'): " default) |
diff --git a/lisp/log-edit.el b/lisp/log-edit.el index 54cf34c7be9..f51966ab220 100644 --- a/lisp/log-edit.el +++ b/lisp/log-edit.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 6 | ;; Keywords: pcl-cvs cvs commit log | 6 | ;; Keywords: pcl-cvs cvs commit log |
| 7 | ;; Revision: $Id: log-edit.el,v 1.16 2001/05/11 20:42:58 monnier Exp $ | 7 | ;; Revision: $Id: log-edit.el,v 1.17 2001/10/30 04:32:58 monnier Exp $ |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
| @@ -38,9 +38,9 @@ | |||
| 38 | (require 'ring) | 38 | (require 'ring) |
| 39 | (require 'vc) | 39 | (require 'vc) |
| 40 | 40 | ||
| 41 | ;;;; | 41 | ;;;; |
| 42 | ;;;; Global Variables | 42 | ;;;; Global Variables |
| 43 | ;;;; | 43 | ;;;; |
| 44 | 44 | ||
| 45 | (defgroup log-edit nil | 45 | (defgroup log-edit nil |
| 46 | "Major mode for editing RCS and CVS commit messages." | 46 | "Major mode for editing RCS and CVS commit messages." |
| @@ -328,7 +328,7 @@ To select default log text, we: | |||
| 328 | (interactive) | 328 | (interactive) |
| 329 | (when (file-readable-p "CVS/Template") | 329 | (when (file-readable-p "CVS/Template") |
| 330 | (insert-file-contents "CVS/Template"))) | 330 | (insert-file-contents "CVS/Template"))) |
| 331 | 331 | ||
| 332 | 332 | ||
| 333 | (defun log-edit-add-to-changelog () | 333 | (defun log-edit-add-to-changelog () |
| 334 | "Insert this log message into the appropriate ChangeLog file." | 334 | "Insert this log message into the appropriate ChangeLog file." |
| @@ -341,10 +341,10 @@ To select default log text, we: | |||
| 341 | (save-excursion | 341 | (save-excursion |
| 342 | (vc-comment-to-change-log))))) | 342 | (vc-comment-to-change-log))))) |
| 343 | 343 | ||
| 344 | ;;;; | 344 | ;;;; |
| 345 | ;;;; functions for getting commit message from ChangeLog a file... | 345 | ;;;; functions for getting commit message from ChangeLog a file... |
| 346 | ;;;; Courtesy Jim Blandy | 346 | ;;;; Courtesy Jim Blandy |
| 347 | ;;;; | 347 | ;;;; |
| 348 | 348 | ||
| 349 | (defun log-edit-narrow-changelog () | 349 | (defun log-edit-narrow-changelog () |
| 350 | "Narrow to the top page of the current buffer, a ChangeLog file. | 350 | "Narrow to the top page of the current buffer, a ChangeLog file. |
| @@ -446,7 +446,7 @@ where LOGBUFFER is the name of the ChangeLog buffer, and each | |||
| 446 | (save-restriction | 446 | (save-restriction |
| 447 | (log-edit-narrow-changelog) | 447 | (log-edit-narrow-changelog) |
| 448 | (goto-char (point-min)) | 448 | (goto-char (point-min)) |
| 449 | 449 | ||
| 450 | ;; Search for the name of FILE relative to the ChangeLog. If that | 450 | ;; Search for the name of FILE relative to the ChangeLog. If that |
| 451 | ;; doesn't occur anywhere, they're not using full relative | 451 | ;; doesn't occur anywhere, they're not using full relative |
| 452 | ;; filenames in the ChangeLog, so just look for FILE; we'll accept | 452 | ;; filenames in the ChangeLog, so just look for FILE; we'll accept |
diff --git a/lisp/log-view.el b/lisp/log-view.el index ac854ba5d57..efa31cabdcf 100644 --- a/lisp/log-view.el +++ b/lisp/log-view.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 6 | ;; Keywords: rcs sccs cvs log version-control | 6 | ;; Keywords: rcs sccs cvs log version-control |
| 7 | ;; Revision: $Id: log-view.el,v 1.13 2001/12/31 20:25:41 rms Exp $ | 7 | ;; Revision: $Id: log-view.el,v 1.14 2003/01/14 21:46:13 monnier Exp $ |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
| @@ -181,7 +181,7 @@ | |||
| 181 | (interactive "d") | 181 | (interactive "d") |
| 182 | (save-excursion | 182 | (save-excursion |
| 183 | (goto-char pos) | 183 | (goto-char pos) |
| 184 | (switch-to-buffer (vc-find-version (log-view-current-file) | 184 | (switch-to-buffer (vc-find-version (log-view-current-file) |
| 185 | (log-view-current-tag))))) | 185 | (log-view-current-tag))))) |
| 186 | 186 | ||
| 187 | ;; | 187 | ;; |
diff --git a/lisp/lpr.el b/lisp/lpr.el index 21e82208e6a..4d1ec5d77e7 100644 --- a/lisp/lpr.el +++ b/lisp/lpr.el | |||
| @@ -164,7 +164,7 @@ If it is nil (the default), we run the `pr' program (or whatever program | |||
| 164 | 164 | ||
| 165 | Otherwise, the switches in `lpr-headers-switches' are used | 165 | Otherwise, the switches in `lpr-headers-switches' are used |
| 166 | in the print command itself; we expect them to request pagination. | 166 | in the print command itself; we expect them to request pagination. |
| 167 | 167 | ||
| 168 | See the variables `lpr-switches' and `lpr-command' | 168 | See the variables `lpr-switches' and `lpr-command' |
| 169 | for further customization of the printer command." | 169 | for further customization of the printer command." |
| 170 | (interactive) | 170 | (interactive) |
| @@ -189,7 +189,7 @@ If it is nil (the default), we run the `pr' program (or whatever program | |||
| 189 | 189 | ||
| 190 | Otherwise, the switches in `lpr-headers-switches' are used | 190 | Otherwise, the switches in `lpr-headers-switches' are used |
| 191 | in the print command itself; we expect them to request pagination. | 191 | in the print command itself; we expect them to request pagination. |
| 192 | 192 | ||
| 193 | See the variables `lpr-switches' and `lpr-command' | 193 | See the variables `lpr-switches' and `lpr-command' |
| 194 | for further customization of the printer command." | 194 | for further customization of the printer command." |
| 195 | (interactive "r") | 195 | (interactive "r") |
diff --git a/lisp/macros.el b/lisp/macros.el index 11fa2223a4e..ee3b16f7764 100644 --- a/lisp/macros.el +++ b/lisp/macros.el | |||
| @@ -258,7 +258,7 @@ and mark at opposite ends of the quoted section, and use | |||
| 258 | Suppose you wanted to build a keyword table in C where each entry | 258 | Suppose you wanted to build a keyword table in C where each entry |
| 259 | looked like this: | 259 | looked like this: |
| 260 | 260 | ||
| 261 | { \"foo\", foo_data, foo_function }, | 261 | { \"foo\", foo_data, foo_function }, |
| 262 | { \"bar\", bar_data, bar_function }, | 262 | { \"bar\", bar_data, bar_function }, |
| 263 | { \"baz\", baz_data, baz_function }, | 263 | { \"baz\", baz_data, baz_function }, |
| 264 | 264 | ||
diff --git a/lisp/makefile.nt b/lisp/makefile.nt index ac47c64c0b2..2b6b435a263 100644 --- a/lisp/makefile.nt +++ b/lisp/makefile.nt | |||
| @@ -3,17 +3,17 @@ | |||
| 3 | # Copyright (c) 1994 Free Software Foundation, Inc. | 3 | # Copyright (c) 1994 Free Software Foundation, Inc. |
| 4 | # | 4 | # |
| 5 | # This file is part of GNU Emacs. | 5 | # This file is part of GNU Emacs. |
| 6 | # | 6 | # |
| 7 | # GNU Emacs is free software; you can redistribute it and/or modify | 7 | # GNU Emacs is free software; you can redistribute it and/or modify |
| 8 | # it under the terms of the GNU General Public License as published by | 8 | # it under the terms of the GNU General Public License as published by |
| 9 | # the Free Software Foundation; either version 2, or (at your option) | 9 | # the Free Software Foundation; either version 2, or (at your option) |
| 10 | # any later version. | 10 | # any later version. |
| 11 | # | 11 | # |
| 12 | # GNU Emacs is distributed in the hope that it will be useful, | 12 | # GNU Emacs is distributed in the hope that it will be useful, |
| 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 15 | # GNU General Public License for more details. | 15 | # GNU General Public License for more details. |
| 16 | # | 16 | # |
| 17 | # You should have received a copy of the GNU General Public License | 17 | # You should have received a copy of the GNU General Public License |
| 18 | # along with GNU Emacs; see the file COPYING. If not, write to the | 18 | # along with GNU Emacs; see the file COPYING. If not, write to the |
| 19 | # Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 19 | # Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| @@ -265,7 +265,7 @@ install: | |||
| 265 | 265 | ||
| 266 | # | 266 | # |
| 267 | # Maintenance | 267 | # Maintenance |
| 268 | # | 268 | # |
| 269 | clean: | 269 | clean: |
| 270 | - $(DEL) *~ term\*~ | 270 | - $(DEL) *~ term\*~ |
| 271 | - $(DEL) *.orig *.rej *.crlf | 271 | - $(DEL) *.orig *.rej *.crlf |
diff --git a/lisp/man.el b/lisp/man.el index 855565242e2..ed3fbf5d66b 100644 --- a/lisp/man.el +++ b/lisp/man.el | |||
| @@ -618,7 +618,7 @@ all sections related to a subject, put something appropriate into the | |||
| 618 | (start-process manual-program buffer "sh" "-c" | 618 | (start-process manual-program buffer "sh" "-c" |
| 619 | (format (Man-build-man-command) man-args)) | 619 | (format (Man-build-man-command) man-args)) |
| 620 | 'Man-bgproc-sentinel) | 620 | 'Man-bgproc-sentinel) |
| 621 | (let ((process-environment | 621 | (let ((process-environment |
| 622 | (cons "GROFF_NO_SGR=1" process-environment))) | 622 | (cons "GROFF_NO_SGR=1" process-environment))) |
| 623 | 623 | ||
| 624 | (let ((exit-status | 624 | (let ((exit-status |
diff --git a/lisp/master.el b/lisp/master.el index 115823e3087..2ef728cdcdf 100644 --- a/lisp/master.el +++ b/lisp/master.el | |||
| @@ -51,14 +51,14 @@ | |||
| 51 | ;; Rob Riepel <networking.stanford.edu> | 51 | ;; Rob Riepel <networking.stanford.edu> |
| 52 | 52 | ||
| 53 | ;;; History: | 53 | ;;; History: |
| 54 | ;; | 54 | ;; |
| 55 | 55 | ||
| 56 | ;;; Code: | 56 | ;;; Code: |
| 57 | 57 | ||
| 58 | (require 'easy-mmode) | 58 | (require 'easy-mmode) |
| 59 | 59 | ||
| 60 | ;; Variables that don't need initialization. | 60 | ;; Variables that don't need initialization. |
| 61 | 61 | ||
| 62 | (defvar master-of nil | 62 | (defvar master-of nil |
| 63 | "Slave buffer of the current buffer. See `master-mode'. | 63 | "Slave buffer of the current buffer. See `master-mode'. |
| 64 | You can set this variable using `master-set-slave'.") | 64 | You can set this variable using `master-set-slave'.") |
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 9698cd4de91..3c93983b939 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el | |||
| @@ -1299,7 +1299,7 @@ key (or menu-item)")) | |||
| 1299 | 1299 | ||
| 1300 | (defun help-with-tutorial-spec-language () | 1300 | (defun help-with-tutorial-spec-language () |
| 1301 | "Use the Emacs tutorial, specifying which language you want." | 1301 | "Use the Emacs tutorial, specifying which language you want." |
| 1302 | (interactive) | 1302 | (interactive) |
| 1303 | (help-with-tutorial t)) | 1303 | (help-with-tutorial t)) |
| 1304 | 1304 | ||
| 1305 | (define-key menu-bar-help-menu [emacs-tutorial-language-specific] | 1305 | (define-key menu-bar-help-menu [emacs-tutorial-language-specific] |
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el index 339fc38c096..a9fa32d1273 100644 --- a/lisp/minibuf-eldef.el +++ b/lisp/minibuf-eldef.el | |||
| @@ -51,7 +51,7 @@ regexp subexpression that matched.") | |||
| 51 | 51 | ||
| 52 | ;; A list of minibuffers to which we've added a post-command-hook. | 52 | ;; A list of minibuffers to which we've added a post-command-hook. |
| 53 | (defvar minibuf-eldef-frobbed-minibufs nil) | 53 | (defvar minibuf-eldef-frobbed-minibufs nil) |
| 54 | 54 | ||
| 55 | ;;; The following are all local variables in the minibuffer | 55 | ;;; The following are all local variables in the minibuffer |
| 56 | 56 | ||
| 57 | ;; Input pre-inserted into the minibuffer before the user can edit it. | 57 | ;; Input pre-inserted into the minibuffer before the user can edit it. |
diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el index 70a5b14e7b6..259eb629568 100644 --- a/lisp/mouse-copy.el +++ b/lisp/mouse-copy.el | |||
| @@ -151,7 +151,7 @@ If you have the bug (or the real fix :-), please let me know." | |||
| 151 | (set-buffer end-buffer) | 151 | (set-buffer end-buffer) |
| 152 | (x-set-selection 'SECONDARY (buffer-substring beg end))))) | 152 | (x-set-selection 'SECONDARY (buffer-substring beg end))))) |
| 153 | 153 | ||
| 154 | 154 | ||
| 155 | (defun mouse-drag-secondary-pasting (start-event) | 155 | (defun mouse-drag-secondary-pasting (start-event) |
| 156 | "Drag out a secondary selection, then paste it at the current point. | 156 | "Drag out a secondary selection, then paste it at the current point. |
| 157 | 157 | ||
| @@ -182,7 +182,7 @@ put the point at one place, then click and drag over some other region." | |||
| 182 | (insert (x-get-selection 'SECONDARY)) | 182 | (insert (x-get-selection 'SECONDARY)) |
| 183 | (setq mouse-copy-last-paste-end (point))) | 183 | (setq mouse-copy-last-paste-end (point))) |
| 184 | (setq mouse-copy-last-paste-start nil))) | 184 | (setq mouse-copy-last-paste-start nil))) |
| 185 | 185 | ||
| 186 | 186 | ||
| 187 | (defun mouse-kill-preserving-secondary () | 187 | (defun mouse-kill-preserving-secondary () |
| 188 | "Kill the text in the secondary selection, but leave the selection set. | 188 | "Kill the text in the secondary selection, but leave the selection set. |
diff --git a/lisp/msb.el b/lisp/msb.el index 5c318420376..453dcb71995 100644 --- a/lisp/msb.el +++ b/lisp/msb.el | |||
| @@ -41,11 +41,11 @@ | |||
| 41 | ;; There are some constants for you to try here: | 41 | ;; There are some constants for you to try here: |
| 42 | ;; msb--few-menus | 42 | ;; msb--few-menus |
| 43 | ;; msb--very-many-menus (default) | 43 | ;; msb--very-many-menus (default) |
| 44 | ;; | 44 | ;; |
| 45 | ;; Look at the variable `msb-item-handling-function' for customization | 45 | ;; Look at the variable `msb-item-handling-function' for customization |
| 46 | ;; of the appearance of every menu item. Try for instance setting | 46 | ;; of the appearance of every menu item. Try for instance setting |
| 47 | ;; it to `msb-alon-item-handler'. | 47 | ;; it to `msb-alon-item-handler'. |
| 48 | ;; | 48 | ;; |
| 49 | ;; Look at the variable `msb-item-sort-function' for customization | 49 | ;; Look at the variable `msb-item-sort-function' for customization |
| 50 | ;; of sorting the menus. Set it to t for instance, which means no | 50 | ;; of sorting the menus. Set it to t for instance, which means no |
| 51 | ;; sorting - you will get latest used buffer first. | 51 | ;; sorting - you will get latest used buffer first. |
| @@ -320,7 +320,7 @@ No buffers at all if less than 1 or nil (or any non-number)." | |||
| 320 | :type 'string | 320 | :type 'string |
| 321 | :set 'msb-custom-set | 321 | :set 'msb-custom-set |
| 322 | :group 'msb) | 322 | :group 'msb) |
| 323 | 323 | ||
| 324 | (defvar msb-horizontal-shift-function '(lambda () 0) | 324 | (defvar msb-horizontal-shift-function '(lambda () 0) |
| 325 | "*Function that specifies how many pixels to shift the top menu leftwards.") | 325 | "*Function that specifies how many pixels to shift the top menu leftwards.") |
| 326 | 326 | ||
| @@ -362,7 +362,7 @@ Set this to nil or t if you don't want any sorting (faster)." | |||
| 362 | (const :tag "Oldest first" nil)) | 362 | (const :tag "Oldest first" nil)) |
| 363 | :set 'msb-custom-set | 363 | :set 'msb-custom-set |
| 364 | :group 'msb) | 364 | :group 'msb) |
| 365 | 365 | ||
| 366 | (defcustom msb-files-by-directory nil | 366 | (defcustom msb-files-by-directory nil |
| 367 | "*Non-nil means that files should be sorted by directory. | 367 | "*Non-nil means that files should be sorted by directory. |
| 368 | This is instead of the groups in `msb-menu-cond'." | 368 | This is instead of the groups in `msb-menu-cond'." |
| @@ -729,7 +729,7 @@ to the buffer-list variable in function-info." | |||
| 729 | max-buffer-name-length) | 729 | max-buffer-name-length) |
| 730 | buffer) | 730 | buffer) |
| 731 | (eval list-symbol))))) | 731 | (eval list-symbol))))) |
| 732 | 732 | ||
| 733 | (defsubst msb--choose-menu (buffer function-info-vector max-buffer-name-length) | 733 | (defsubst msb--choose-menu (buffer function-info-vector max-buffer-name-length) |
| 734 | "Select the appropriate menu for BUFFER." | 734 | "Select the appropriate menu for BUFFER." |
| 735 | ;; This is all side-effects, folks! | 735 | ;; This is all side-effects, folks! |
diff --git a/lisp/mwheel.el b/lisp/mwheel.el index 546d27dd345..97bed138b84 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el | |||
| @@ -204,7 +204,7 @@ This should only be bound to mouse buttons 4 and 5." | |||
| 204 | (if mwheel-inhibit-click-event-timer | 204 | (if mwheel-inhibit-click-event-timer |
| 205 | (cancel-timer mwheel-inhibit-click-event-timer) | 205 | (cancel-timer mwheel-inhibit-click-event-timer) |
| 206 | (add-hook 'pre-command-hook 'mwheel-filter-click-events)) | 206 | (add-hook 'pre-command-hook 'mwheel-filter-click-events)) |
| 207 | (setq mwheel-inhibit-click-event-timer | 207 | (setq mwheel-inhibit-click-event-timer |
| 208 | (run-with-timer mouse-wheel-inhibit-click-time nil | 208 | (run-with-timer mouse-wheel-inhibit-click-time nil |
| 209 | 'mwheel-inhibit-click-timeout)))) | 209 | 'mwheel-inhibit-click-timeout)))) |
| 210 | 210 | ||
diff --git a/lisp/newcomment.el b/lisp/newcomment.el index 52f9544a7fd..e108264903c 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el | |||
| @@ -262,7 +262,7 @@ This is obsolete because you might as well use \\[newline-and-indent]." | |||
| 262 | (if (and comment-quote-nested (<= (length ce) 1)) "" "+") | 262 | (if (and comment-quote-nested (<= (length ce) 1)) "" "+") |
| 263 | (regexp-quote (substring ce 1)) | 263 | (regexp-quote (substring ce 1)) |
| 264 | "\\)")))))) | 264 | "\\)")))))) |
| 265 | 265 | ||
| 266 | (defun comment-quote-re (str unp) | 266 | (defun comment-quote-re (str unp) |
| 267 | (concat (regexp-quote (substring str 0 1)) | 267 | (concat (regexp-quote (substring str 0 1)) |
| 268 | "\\\\" (if unp "+" "*") | 268 | "\\\\" (if unp "+" "*") |
| @@ -789,7 +789,7 @@ rather than at left margin." | |||
| 789 | (unless block (setq cce nil)) | 789 | (unless block (setq cce nil)) |
| 790 | ;; Continuation defaults to the same as CS and CE. | 790 | ;; Continuation defaults to the same as CS and CE. |
| 791 | (unless ccs (setq ccs cs cce ce)) | 791 | (unless ccs (setq ccs cs cce ce)) |
| 792 | 792 | ||
| 793 | (save-excursion | 793 | (save-excursion |
| 794 | (goto-char end) | 794 | (goto-char end) |
| 795 | ;; If the end is not at the end of a line and the comment-end | 795 | ;; If the end is not at the end of a line and the comment-end |
| @@ -811,7 +811,7 @@ rather than at left margin." | |||
| 811 | (end-of-line) | 811 | (end-of-line) |
| 812 | (setq max-indent (max max-indent (current-column))) | 812 | (setq max-indent (max max-indent (current-column))) |
| 813 | (not (or (eobp) (progn (forward-line) nil))))) | 813 | (not (or (eobp) (progn (forward-line) nil))))) |
| 814 | 814 | ||
| 815 | ;; Inserting ccs can change max-indent by (1- tab-width). | 815 | ;; Inserting ccs can change max-indent by (1- tab-width). |
| 816 | (setq max-indent | 816 | (setq max-indent |
| 817 | (+ max-indent (max (length cs) (length ccs)) tab-width -1)) | 817 | (+ max-indent (max (length cs) (length ccs)) tab-width -1)) |
| @@ -824,7 +824,7 @@ rather than at left margin." | |||
| 824 | cs ce ccs cce min-indent max-indent block))) | 824 | cs ce ccs cce min-indent max-indent block))) |
| 825 | (setq cs (car csce)) | 825 | (setq cs (car csce)) |
| 826 | (setq ce (cdr csce)))) | 826 | (setq ce (cdr csce)))) |
| 827 | 827 | ||
| 828 | (goto-char (point-min)) | 828 | (goto-char (point-min)) |
| 829 | ;; Loop over all lines from BEG to END. | 829 | ;; Loop over all lines from BEG to END. |
| 830 | (while | 830 | (while |
diff --git a/lisp/options.el b/lisp/options.el index b7684034695..53a67516b2f 100644 --- a/lisp/options.el +++ b/lisp/options.el | |||
| @@ -52,7 +52,7 @@ It is now better to use Customize instead." | |||
| 52 | (princ ":\n\t") | 52 | (princ ":\n\t") |
| 53 | (prin1 (symbol-value sym)) | 53 | (prin1 (symbol-value sym)) |
| 54 | (terpri) | 54 | (terpri) |
| 55 | (princ (substitute-command-keys | 55 | (princ (substitute-command-keys |
| 56 | (documentation-property sym 'variable-documentation))) | 56 | (documentation-property sym 'variable-documentation))) |
| 57 | (princ "\n;;\n")) | 57 | (princ "\n;;\n")) |
| 58 | (setq vars (cdr vars)))) | 58 | (setq vars (cdr vars)))) |
diff --git a/lisp/paren.el b/lisp/paren.el index a88c1f39857..60c9aef0f39 100644 --- a/lisp/paren.el +++ b/lisp/paren.el | |||
| @@ -64,13 +64,13 @@ otherwise)." | |||
| 64 | :type 'integer | 64 | :type 'integer |
| 65 | :group 'paren-showing | 65 | :group 'paren-showing |
| 66 | :version "21.1") | 66 | :version "21.1") |
| 67 | 67 | ||
| 68 | (defcustom show-paren-ring-bell-on-mismatch nil | 68 | (defcustom show-paren-ring-bell-on-mismatch nil |
| 69 | "*If non-nil, beep if mismatched paren is detected." | 69 | "*If non-nil, beep if mismatched paren is detected." |
| 70 | :type 'boolean | 70 | :type 'boolean |
| 71 | :group 'paren-showing | 71 | :group 'paren-showing |
| 72 | :version "20.3") | 72 | :version "20.3") |
| 73 | 73 | ||
| 74 | (defface show-paren-match-face | 74 | (defface show-paren-match-face |
| 75 | '((((class color) (background light)) | 75 | '((((class color) (background light)) |
| 76 | :background "turquoise") ; looks OK on tty (becomes cyan) | 76 | :background "turquoise") ; looks OK on tty (becomes cyan) |
diff --git a/lisp/paths.el b/lisp/paths.el index b4e18c5e01f..f0d5a8d5cd9 100644 --- a/lisp/paths.el +++ b/lisp/paths.el | |||
| @@ -139,7 +139,7 @@ The `ORGANIZATION' environment variable is used instead if defined.") | |||
| 139 | (defconst rmail-spool-directory | 139 | (defconst rmail-spool-directory |
| 140 | (cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration) | 140 | (cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration) |
| 141 | "/usr/spool/mail/") | 141 | "/usr/spool/mail/") |
| 142 | ;; On The Bull DPX/2 /usr/spool/mail is used although | 142 | ;; On The Bull DPX/2 /usr/spool/mail is used although |
| 143 | ;; it is usg-unix-v. | 143 | ;; it is usg-unix-v. |
| 144 | ((string-match "^m68k-bull-sysv3" system-configuration) | 144 | ((string-match "^m68k-bull-sysv3" system-configuration) |
| 145 | "/usr/spool/mail/") | 145 | "/usr/spool/mail/") |
| @@ -193,7 +193,7 @@ If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\")) | |||
| 193 | You may set this variable to nil in your `.emacs' file if you do not wish | 193 | You may set this variable to nil in your `.emacs' file if you do not wish |
| 194 | the terminal-initialization file to be loaded.") | 194 | the terminal-initialization file to be loaded.") |
| 195 | 195 | ||
| 196 | (defconst abbrev-file-name | 196 | (defconst abbrev-file-name |
| 197 | (if (eq system-type 'vax-vms) | 197 | (if (eq system-type 'vax-vms) |
| 198 | "~/abbrev.def" | 198 | "~/abbrev.def" |
| 199 | (convert-standard-filename "~/.abbrev_defs")) | 199 | (convert-standard-filename "~/.abbrev_defs")) |
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el index 2c78dd38f66..2f0e92a1668 100644 --- a/lisp/pcvs-info.el +++ b/lisp/pcvs-info.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 6 | ;; Keywords: pcl-cvs | 6 | ;; Keywords: pcl-cvs |
| 7 | ;; Revision: $Id: pcvs-info.el,v 1.13 2002/09/11 01:56:47 rms Exp $ | 7 | ;; Revision: $Id: pcvs-info.el,v 1.14 2003/01/14 21:53:39 monnier Exp $ |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
| @@ -170,7 +170,7 @@ to confuse some users sometimes." | |||
| 170 | ;; untouched version resides. | 170 | ;; untouched version resides. |
| 171 | 171 | ||
| 172 | ;; The meaning of the type field: | 172 | ;; The meaning of the type field: |
| 173 | 173 | ||
| 174 | ;; Value ---Used by--- Explanation | 174 | ;; Value ---Used by--- Explanation |
| 175 | ;; update status | 175 | ;; update status |
| 176 | ;; NEED-UPDATE x file needs update | 176 | ;; NEED-UPDATE x file needs update |
| @@ -269,9 +269,9 @@ to confuse some users sometimes." | |||
| 269 | (error "Invalid :%s in cvs-fileinfo %s" check fi)))) | 269 | (error "Invalid :%s in cvs-fileinfo %s" check fi)))) |
| 270 | 270 | ||
| 271 | 271 | ||
| 272 | ;;;; | 272 | ;;;; |
| 273 | ;;;; State table to indicate what you can do when. | 273 | ;;;; State table to indicate what you can do when. |
| 274 | ;;;; | 274 | ;;;; |
| 275 | 275 | ||
| 276 | (defconst cvs-states | 276 | (defconst cvs-states |
| 277 | `((NEED-UPDATE update diff) | 277 | `((NEED-UPDATE update diff) |
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 4e008877da6..1b2db2eb18a 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 6 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 7 | ;; Keywords: pcl-cvs | 7 | ;; Keywords: pcl-cvs |
| 8 | ;; Revision: $Id: pcvs-parse.el,v 1.12 2002/06/24 22:49:06 monnier Exp $ | 8 | ;; Revision: $Id: pcvs-parse.el,v 1.13 2002/09/03 01:23:15 monnier Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -202,7 +202,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 202 | "Table of message objects for `cvs-parse-process'." | 202 | "Table of message objects for `cvs-parse-process'." |
| 203 | (let (c file dir path type base-rev subtype) | 203 | (let (c file dir path type base-rev subtype) |
| 204 | (cvs-or | 204 | (cvs-or |
| 205 | 205 | ||
| 206 | (cvs-parse-status) | 206 | (cvs-parse-status) |
| 207 | (cvs-parse-merge) | 207 | (cvs-parse-merge) |
| 208 | (cvs-parse-commit) | 208 | (cvs-parse-commit) |
| @@ -211,7 +211,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 211 | ;; such duplicate info and luckily the second info is the one we want. | 211 | ;; such duplicate info and luckily the second info is the one we want. |
| 212 | ;; (and (cvs-match "M \\(.*\\)$" (path 1)) | 212 | ;; (and (cvs-match "M \\(.*\\)$" (path 1)) |
| 213 | ;; (cvs-parse-merge path)) | 213 | ;; (cvs-parse-merge path)) |
| 214 | 214 | ||
| 215 | ;; Normal file state indicator. | 215 | ;; Normal file state indicator. |
| 216 | (and | 216 | (and |
| 217 | (cvs-match "\\([MARCUPNJ?]\\) \\(.*\\)$" (c 1) (path 2)) | 217 | (cvs-match "\\([MARCUPNJ?]\\) \\(.*\\)$" (c 1) (path 2)) |
| @@ -311,7 +311,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 311 | 'MISSING | 311 | 'MISSING |
| 312 | '(UP-TO-DATE . UPDATED)) | 312 | '(UP-TO-DATE . UPDATED)) |
| 313 | path)) | 313 | path)) |
| 314 | 314 | ||
| 315 | ;; Mode conflicts (rather than contents) | 315 | ;; Mode conflicts (rather than contents) |
| 316 | (and | 316 | (and |
| 317 | (cvs-match "conflict: ") | 317 | (cvs-match "conflict: ") |
| @@ -333,7 +333,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 333 | (cvs-match "sticky tag .* for file `\\(.*\\)' is not a branch$" | 333 | (cvs-match "sticky tag .* for file `\\(.*\\)' is not a branch$" |
| 334 | (file 1))) | 334 | (file 1))) |
| 335 | (cvs-parsed-fileinfo 'MESSAGE file)) | 335 | (cvs-parsed-fileinfo 'MESSAGE file)) |
| 336 | 336 | ||
| 337 | ;; File unknown. | 337 | ;; File unknown. |
| 338 | (and (cvs-match "use `.+ add' to create an entry for \\(.*\\)$" (path 1)) | 338 | (and (cvs-match "use `.+ add' to create an entry for \\(.*\\)$" (path 1)) |
| 339 | (cvs-parsed-fileinfo 'UNKNOWN path)) | 339 | (cvs-parsed-fileinfo 'UNKNOWN path)) |
| @@ -351,7 +351,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 351 | 'MESSAGE "" " " | 351 | 'MESSAGE "" " " |
| 352 | "*** Add (setq cvs-execute-single-dir t) to your .emacs *** | 352 | "*** Add (setq cvs-execute-single-dir t) to your .emacs *** |
| 353 | See the FAQ file or the variable's documentation for more info.")) | 353 | See the FAQ file or the variable's documentation for more info.")) |
| 354 | 354 | ||
| 355 | ;; Cvs waits for a lock. Ignored: already handled by the process filter | 355 | ;; Cvs waits for a lock. Ignored: already handled by the process filter |
| 356 | (cvs-match "\\[..:..:..\\] \\(waiting for\\|obtained\\) .*lock in .*$") | 356 | (cvs-match "\\[..:..:..\\] \\(waiting for\\|obtained\\) .*lock in .*$") |
| 357 | ;; File you removed still exists. Ignore (will be noted as removed). | 357 | ;; File you removed still exists. Ignore (will be noted as removed). |
| @@ -368,7 +368,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 368 | (cvs-match "Rebuilding administrative file database$") | 368 | (cvs-match "Rebuilding administrative file database$") |
| 369 | ;; ??? | 369 | ;; ??? |
| 370 | (cvs-match "--> Using per-directory sticky tag `.*'") | 370 | (cvs-match "--> Using per-directory sticky tag `.*'") |
| 371 | 371 | ||
| 372 | ;; CVS is running a *info program. | 372 | ;; CVS is running a *info program. |
| 373 | (and | 373 | (and |
| 374 | (cvs-match "Executing.*$") | 374 | (cvs-match "Executing.*$") |
| @@ -380,7 +380,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 380 | (and | 380 | (and |
| 381 | (cvs-match "cvs[.ex]* \\[[a-z]+ aborted\\]:.*$") | 381 | (cvs-match "cvs[.ex]* \\[[a-z]+ aborted\\]:.*$") |
| 382 | (cvs-parsed-fileinfo 'MESSAGE "")) | 382 | (cvs-parsed-fileinfo 'MESSAGE "")) |
| 383 | 383 | ||
| 384 | ;; sadly you can't do much with these since the path is in the repository | 384 | ;; sadly you can't do much with these since the path is in the repository |
| 385 | (cvs-match "Directory .* added to the repository$") | 385 | (cvs-match "Directory .* added to the repository$") |
| 386 | ))) | 386 | ))) |
| @@ -502,7 +502,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 502 | ;; a `current-dir' set to something different from "" | 502 | ;; a `current-dir' set to something different from "" |
| 503 | (cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype) path 'trust | 503 | (cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype) path 'trust |
| 504 | :base-rev base-rev))) | 504 | :base-rev base-rev))) |
| 505 | 505 | ||
| 506 | ;; useless message added before the actual addition: ignored | 506 | ;; useless message added before the actual addition: ignored |
| 507 | (cvs-match "RCS file: .*\ndone$")))) | 507 | (cvs-match "RCS file: .*\ndone$")))) |
| 508 | 508 | ||
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el index 849bbd69f4f..78e420babc7 100644 --- a/lisp/pcvs-util.el +++ b/lisp/pcvs-util.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 6 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 7 | ;; Keywords: pcl-cvs | 7 | ;; Keywords: pcl-cvs |
| 8 | ;; Revision: $Id: pcvs-util.el,v 1.16 2001/12/02 07:41:47 monnier Exp $ | 8 | ;; Revision: $Id: pcvs-util.el,v 1.17 2001/12/20 18:43:07 pj Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -50,7 +50,7 @@ | |||
| 50 | (let ((zs ys)) | 50 | (let ((zs ys)) |
| 51 | (dolist (x xs zs) | 51 | (dolist (x xs zs) |
| 52 | (unless (member x ys) (push x zs))))) | 52 | (unless (member x ys) (push x zs))))) |
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | (defun cvs-map (-cvs-map-f &rest -cvs-map-ls) | 55 | (defun cvs-map (-cvs-map-f &rest -cvs-map-ls) |
| 56 | (unless (cvs-every 'null -cvs-map-ls) | 56 | (unless (cvs-every 'null -cvs-map-ls) |
| @@ -135,7 +135,7 @@ BUF is assumed to be a temporary buffer used from the buffer MAINBUF." | |||
| 135 | (let ((mainwin (or (get-buffer-window mainbuf) | 135 | (let ((mainwin (or (get-buffer-window mainbuf) |
| 136 | (get-buffer-window mainbuf 'visible)))) | 136 | (get-buffer-window mainbuf 'visible)))) |
| 137 | (when mainwin (select-window mainwin)))))) | 137 | (when mainwin (select-window mainwin)))))) |
| 138 | 138 | ||
| 139 | (defun cvs-get-buffer-create (name &optional noreuse) | 139 | (defun cvs-get-buffer-create (name &optional noreuse) |
| 140 | "Create a buffer NAME unless such a buffer already exists. | 140 | "Create a buffer NAME unless such a buffer already exists. |
| 141 | If the NAME looks like an absolute file name, the buffer will be created | 141 | If the NAME looks like an absolute file name, the buffer will be created |
| @@ -231,9 +231,9 @@ The SEPARATOR regexp defaults to \"\\s-+\"." | |||
| 231 | (cvs-string->strings (substring string (cdr rfs)) | 231 | (cvs-string->strings (substring string (cdr rfs)) |
| 232 | sep))))))) | 232 | sep))))))) |
| 233 | 233 | ||
| 234 | ;;;; | 234 | ;;;; |
| 235 | ;;;; file names | 235 | ;;;; file names |
| 236 | ;;;; | 236 | ;;;; |
| 237 | 237 | ||
| 238 | (defsubst cvs-expand-dir-name (d) | 238 | (defsubst cvs-expand-dir-name (d) |
| 239 | (file-name-as-directory (expand-file-name d))) | 239 | (file-name-as-directory (expand-file-name d))) |
| @@ -273,9 +273,9 @@ The SEPARATOR regexp defaults to \"\\s-+\"." | |||
| 273 | initval hist-sym)) | 273 | initval hist-sym)) |
| 274 | (t initval))))) | 274 | (t initval))))) |
| 275 | 275 | ||
| 276 | ;;;; | 276 | ;;;; |
| 277 | ;;;; Flags handling | 277 | ;;;; Flags handling |
| 278 | ;;;; | 278 | ;;;; |
| 279 | 279 | ||
| 280 | (defstruct (cvs-flags | 280 | (defstruct (cvs-flags |
| 281 | (:constructor nil) | 281 | (:constructor nil) |
| @@ -335,9 +335,9 @@ If it is \\[universal-argument] \\[universal-argument], behave just | |||
| 335 | "Set SYM's INDEX'th setting to VALUE." | 335 | "Set SYM's INDEX'th setting to VALUE." |
| 336 | (setf (nth index (cvs-flags-defaults (symbol-value sym))) value)) | 336 | (setf (nth index (cvs-flags-defaults (symbol-value sym))) value)) |
| 337 | 337 | ||
| 338 | ;;;; | 338 | ;;;; |
| 339 | ;;;; Prefix keys | 339 | ;;;; Prefix keys |
| 340 | ;;;; | 340 | ;;;; |
| 341 | 341 | ||
| 342 | (defconst cvs-prefix-number 10) | 342 | (defconst cvs-prefix-number 10) |
| 343 | 343 | ||
diff --git a/lisp/pcvs.el b/lisp/pcvs.el index 32631c09da9..cc3fedaf62a 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | ;; (Jari Aalto+mail.emacs) jari.aalto@poboxes.com | 14 | ;; (Jari Aalto+mail.emacs) jari.aalto@poboxes.com |
| 15 | ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/pcl@flint.cs.yale.edu | 15 | ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/pcl@flint.cs.yale.edu |
| 16 | ;; Keywords: CVS, version control, release management | 16 | ;; Keywords: CVS, version control, release management |
| 17 | ;; Revision: $Id: pcvs.el,v 1.45 2002/11/18 20:53:24 rost Exp $ | 17 | ;; Revision: $Id: pcvs.el,v 1.46 2002/12/05 15:23:37 monnier Exp $ |
| 18 | 18 | ||
| 19 | ;; This file is part of GNU Emacs. | 19 | ;; This file is part of GNU Emacs. |
| 20 | 20 | ||
| @@ -60,7 +60,7 @@ | |||
| 60 | ;;; Todo: | 60 | ;;; Todo: |
| 61 | 61 | ||
| 62 | ;; ******** FIX THE DOCUMENTATION ********* | 62 | ;; ******** FIX THE DOCUMENTATION ********* |
| 63 | ;; | 63 | ;; |
| 64 | ;; - rework the displaying of error messages. | 64 | ;; - rework the displaying of error messages. |
| 65 | ;; - allow to flush messages only | 65 | ;; - allow to flush messages only |
| 66 | ;; - allow to protect files like ChangeLog from flushing | 66 | ;; - allow to protect files like ChangeLog from flushing |
| @@ -72,7 +72,7 @@ | |||
| 72 | ;; - allow cvs-confirm-removals to force always confirmation. | 72 | ;; - allow cvs-confirm-removals to force always confirmation. |
| 73 | ;; - cvs-checkout should ask for a revision (with completion). | 73 | ;; - cvs-checkout should ask for a revision (with completion). |
| 74 | ;; - removal confirmation should allow specifying another file name. | 74 | ;; - removal confirmation should allow specifying another file name. |
| 75 | ;; | 75 | ;; |
| 76 | ;; - hide fileinfos without getting rid of them (will require ewok work). | 76 | ;; - hide fileinfos without getting rid of them (will require ewok work). |
| 77 | ;; - add toolbar entries | 77 | ;; - add toolbar entries |
| 78 | ;; - marking | 78 | ;; - marking |
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el index 3f98e527bd7..00d5e1e15f4 100644 --- a/lisp/ps-bdf.el +++ b/lisp/ps-bdf.el | |||
| @@ -224,7 +224,7 @@ CODE, where N and CODE are in the following relation: | |||
| 224 | (relative-compose 'false) | 224 | (relative-compose 'false) |
| 225 | (baseline-offset 0) | 225 | (baseline-offset 0) |
| 226 | size | 226 | size |
| 227 | font-bounding-box | 227 | font-bounding-box |
| 228 | default-char | 228 | default-char |
| 229 | code-range | 229 | code-range |
| 230 | offset-vector) | 230 | offset-vector) |
diff --git a/lisp/rect.el b/lisp/rect.el index 1fa5900b2c9..c6b83995b73 100644 --- a/lisp/rect.el +++ b/lisp/rect.el | |||
| @@ -187,7 +187,7 @@ the function is called." | |||
| 187 | (setq val (concat " " val) | 187 | (setq val (concat " " val) |
| 188 | n (- n 8))) | 188 | n (- n 8))) |
| 189 | (concat val (aref spaces-strings n))))) | 189 | (concat val (aref spaces-strings n))))) |
| 190 | 190 | ||
| 191 | ;;;###autoload | 191 | ;;;###autoload |
| 192 | (defun delete-rectangle (start end &optional fill) | 192 | (defun delete-rectangle (start end &optional fill) |
| 193 | "Delete (don't save) text in the region-rectangle. | 193 | "Delete (don't save) text in the region-rectangle. |
diff --git a/lisp/register.el b/lisp/register.el index ad65d4b7401..17c804afbd9 100644 --- a/lisp/register.el +++ b/lisp/register.el | |||
| @@ -233,7 +233,7 @@ The Lisp value REGISTER is a character." | |||
| 233 | (progn | 233 | (progn |
| 234 | (princ "the text:\n") | 234 | (princ "the text:\n") |
| 235 | (princ val)) | 235 | (princ val)) |
| 236 | (cond | 236 | (cond |
| 237 | ;; Extract first N characters starting with first non-whitespace. | 237 | ;; Extract first N characters starting with first non-whitespace. |
| 238 | ((string-match (format "[^ \t\n].\\{,%d\\}" | 238 | ((string-match (format "[^ \t\n].\\{,%d\\}" |
| 239 | ;; Deduct 6 for the spaces inserted below. | 239 | ;; Deduct 6 for the spaces inserted below. |
diff --git a/lisp/repeat.el b/lisp/repeat.el index 667303076dd..ae2cc97498a 100644 --- a/lisp/repeat.el +++ b/lisp/repeat.el | |||
| @@ -126,7 +126,7 @@ only occurs if the final character by which `repeat' was invoked is a | |||
| 126 | member of that sequence. If this variable is nil, no re-execution occurs." | 126 | member of that sequence. If this variable is nil, no re-execution occurs." |
| 127 | :group 'convenience | 127 | :group 'convenience |
| 128 | :type 'boolean) | 128 | :type 'boolean) |
| 129 | 129 | ||
| 130 | ;;;;; ****************** HACKS TO THE REST OF EMACS ******************* ;;;;; | 130 | ;;;;; ****************** HACKS TO THE REST OF EMACS ******************* ;;;;; |
| 131 | 131 | ||
| 132 | ;; The basic strategy is to use last-command, a variable built in to Emacs. | 132 | ;; The basic strategy is to use last-command, a variable built in to Emacs. |
| @@ -262,7 +262,7 @@ can be modified by the global variable `repeat-on-final-keystroke'." | |||
| 262 | (setq repeat-last-self-insert | 262 | (setq repeat-last-self-insert |
| 263 | (buffer-substring (car range) | 263 | (buffer-substring (car range) |
| 264 | (cdr range))) | 264 | (cdr range))) |
| 265 | (error (error "%s %s %s" ;Danger, Will Robinson! | 265 | (error (error "%s %s %s" ;Danger, Will Robinson! |
| 266 | "repeat can't intuit what you" | 266 | "repeat can't intuit what you" |
| 267 | "inserted before auto-fill" | 267 | "inserted before auto-fill" |
| 268 | "clobbered it, sorry"))))))) | 268 | "clobbered it, sorry"))))))) |
diff --git a/lisp/replace.el b/lisp/replace.el index 18817d39fc0..14bbb6fb9ad 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -678,7 +678,7 @@ This function acts on multiple buffers; otherwise, it is exactly like | |||
| 678 | (buf nil) | 678 | (buf nil) |
| 679 | (ido-ignore-item-temp-list bufs)) | 679 | (ido-ignore-item-temp-list bufs)) |
| 680 | (while (not (string-equal | 680 | (while (not (string-equal |
| 681 | (setq buf (read-buffer | 681 | (setq buf (read-buffer |
| 682 | (if (eq read-buffer-function 'ido-read-buffer) | 682 | (if (eq read-buffer-function 'ido-read-buffer) |
| 683 | "Next buffer to search (C-j to end): " | 683 | "Next buffer to search (C-j to end): " |
| 684 | "Next buffer to search (RET to end): ") | 684 | "Next buffer to search (RET to end): ") |
diff --git a/lisp/resume.el b/lisp/resume.el index 5e14679974d..36d35ac13a7 100644 --- a/lisp/resume.el +++ b/lisp/resume.el | |||
| @@ -84,7 +84,7 @@ | |||
| 84 | ;; arguments are now in reverse order | 84 | ;; arguments are now in reverse order |
| 85 | (setq args (nreverse args)) | 85 | (setq args (nreverse args)) |
| 86 | ;; make sure they're not read again | 86 | ;; make sure they're not read again |
| 87 | (erase-buffer)) | 87 | (erase-buffer)) |
| 88 | (resume-write-buffer-to-file (current-buffer) resume-emacs-args-file) | 88 | (resume-write-buffer-to-file (current-buffer) resume-emacs-args-file) |
| 89 | ;; if nothing was in buffer, args will be null | 89 | ;; if nothing was in buffer, args will be null |
| 90 | (or (null args) | 90 | (or (null args) |
diff --git a/lisp/rot13.el b/lisp/rot13.el index 2c82a82c226..c427ef3af86 100644 --- a/lisp/rot13.el +++ b/lisp/rot13.el | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | ;;; Commentary: | 25 | ;;; Commentary: |
| 26 | 26 | ||
| 27 | ;; The entry point, `rot13-other-window', performs a Caesar cipher | 27 | ;; The entry point, `rot13-other-window', performs a Caesar cipher |
| 28 | ;; encrypt/decrypt on the current buffer and displays the result in another | 28 | ;; encrypt/decrypt on the current buffer and displays the result in another |
| 29 | ;; window. Rot13 encryption is sometimes used on USENET as a read-at-your- | 29 | ;; window. Rot13 encryption is sometimes used on USENET as a read-at-your- |
| 30 | ;; own-risk wrapper for material some might consider offensive, such as | 30 | ;; own-risk wrapper for material some might consider offensive, such as |
| 31 | ;; ethnic humor. | 31 | ;; ethnic humor. |
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el index 10d7a411ba1..4727af23da6 100644 --- a/lisp/ruler-mode.el +++ b/lisp/ruler-mode.el | |||
| @@ -179,7 +179,7 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or | |||
| 179 | (integer :tag "Integer char value" | 179 | (integer :tag "Integer char value" |
| 180 | :validate ruler-mode-character-validate))) | 180 | :validate ruler-mode-character-validate))) |
| 181 | 181 | ||
| 182 | (defcustom ruler-mode-margins-char ?\ | 182 | (defcustom ruler-mode-margins-char ?\ |
| 183 | "*Character used in margin areas." | 183 | "*Character used in margin areas." |
| 184 | :group 'ruler-mode | 184 | :group 'ruler-mode |
| 185 | :type '(choice | 185 | :type '(choice |
diff --git a/lisp/s-region.el b/lisp/s-region.el index f7cabf012b7..2b53bfa7f5c 100644 --- a/lisp/s-region.el +++ b/lisp/s-region.el | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | ;; Currently, s-region-move may be bound only to events that are vectors | 33 | ;; Currently, s-region-move may be bound only to events that are vectors |
| 34 | ;; of length one and whose last element is a symbol. Also, the functions | 34 | ;; of length one and whose last element is a symbol. Also, the functions |
| 35 | ;; that are given this kind of overlay should be (interactive "p") | 35 | ;; that are given this kind of overlay should be (interactive "p") |
| 36 | ;; functions. | 36 | ;; functions. |
| 37 | 37 | ||
| 38 | ;; If the following keys are not already bound then... | 38 | ;; If the following keys are not already bound then... |
diff --git a/lisp/saveplace.el b/lisp/saveplace.el index f3b99e6cdd8..3211a055335 100644 --- a/lisp/saveplace.el +++ b/lisp/saveplace.el | |||
| @@ -172,7 +172,7 @@ To save places automatically in all files, put this in your `.emacs' file: | |||
| 172 | (delete-region (point-min) (point-max)) | 172 | (delete-region (point-min) (point-max)) |
| 173 | (insert-file-contents file) | 173 | (insert-file-contents file) |
| 174 | (goto-char (point-min)) | 174 | (goto-char (point-min)) |
| 175 | (setq save-place-alist | 175 | (setq save-place-alist |
| 176 | (car (read-from-string | 176 | (car (read-from-string |
| 177 | (buffer-substring (point-min) (point-max))))) | 177 | (buffer-substring (point-min) (point-max))))) |
| 178 | 178 | ||
| @@ -192,7 +192,7 @@ To save places automatically in all files, put this in your `.emacs' file: | |||
| 192 | (setcdr s nil) | 192 | (setcdr s nil) |
| 193 | (setq count (1+ count))) | 193 | (setq count (1+ count))) |
| 194 | (setq s (cdr s)))))) | 194 | (setq s (cdr s)))))) |
| 195 | 195 | ||
| 196 | (kill-buffer (current-buffer)) | 196 | (kill-buffer (current-buffer)) |
| 197 | (message "Loading places from %s...done" file))) | 197 | (message "Loading places from %s...done" file))) |
| 198 | nil)))) | 198 | nil)))) |
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el index c17b251353f..f3bd3d334ff 100644 --- a/lisp/scroll-all.el +++ b/lisp/scroll-all.el | |||
| @@ -99,7 +99,7 @@ | |||
| 99 | (call-interactively 'scroll-all-beginning-of-buffer-all)) | 99 | (call-interactively 'scroll-all-beginning-of-buffer-all)) |
| 100 | ((eq this-command 'end-of-buffer) | 100 | ((eq this-command 'end-of-buffer) |
| 101 | (call-interactively 'scroll-all-end-of-buffer-all)))) | 101 | (call-interactively 'scroll-all-end-of-buffer-all)))) |
| 102 | 102 | ||
| 103 | 103 | ||
| 104 | ;;;###autoload | 104 | ;;;###autoload |
| 105 | (define-minor-mode scroll-all-mode | 105 | (define-minor-mode scroll-all-mode |
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el index 56479c0399f..6b7eb8744c4 100644 --- a/lisp/shadowfile.el +++ b/lisp/shadowfile.el | |||
| @@ -406,7 +406,7 @@ expansion or contraction, you must do that yourself first." | |||
| 406 | (if regexp | 406 | (if regexp |
| 407 | (string-match (nth 2 pattern-sup) (nth 2 file-sup)) | 407 | (string-match (nth 2 pattern-sup) (nth 2 file-sup)) |
| 408 | (string-equal (nth 2 pattern-sup) (nth 2 file-sup)))))) | 408 | (string-equal (nth 2 pattern-sup) (nth 2 file-sup)))))) |
| 409 | 409 | ||
| 410 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 410 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 411 | ;;; User-level Commands | 411 | ;;; User-level Commands |
| 412 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 412 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| @@ -497,7 +497,7 @@ Each site can be either a hostname or the name of a cluster \(see | |||
| 497 | (cons (shadow-make-group regexp sites usernames) | 497 | (cons (shadow-make-group regexp sites usernames) |
| 498 | shadow-regexp-groups)) | 498 | shadow-regexp-groups)) |
| 499 | (shadow-write-info-file))) | 499 | (shadow-write-info-file))) |
| 500 | 500 | ||
| 501 | (defun shadow-shadows () | 501 | (defun shadow-shadows () |
| 502 | ;; Mostly for debugging. | 502 | ;; Mostly for debugging. |
| 503 | "Interactive function to display shadows of a buffer." | 503 | "Interactive function to display shadows of a buffer." |
diff --git a/lisp/simple.el b/lisp/simple.el index 27f301b4261..90ebd908dfb 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -955,7 +955,7 @@ as an argument limits undo to changes within the current region." | |||
| 955 | (let ((modified (buffer-modified-p)) | 955 | (let ((modified (buffer-modified-p)) |
| 956 | (recent-save (recent-auto-save-p))) | 956 | (recent-save (recent-auto-save-p))) |
| 957 | (or (eq (selected-window) (minibuffer-window)) | 957 | (or (eq (selected-window) (minibuffer-window)) |
| 958 | (message (if (and transient-mark-mode mark-active) | 958 | (message (if (and transient-mark-mode mark-active) |
| 959 | "Undo in region!" | 959 | "Undo in region!" |
| 960 | "Undo!"))) | 960 | "Undo!"))) |
| 961 | (unless (eq last-command 'undo) | 961 | (unless (eq last-command 'undo) |
| @@ -1004,8 +1004,8 @@ Some change-hooks test this variable to do something different.") | |||
| 1004 | Call `undo-start' to get ready to undo recent changes, | 1004 | Call `undo-start' to get ready to undo recent changes, |
| 1005 | then call `undo-more' one or more times to undo them." | 1005 | then call `undo-more' one or more times to undo them." |
| 1006 | (or pending-undo-list | 1006 | (or pending-undo-list |
| 1007 | (error (format "No further undo information%s" | 1007 | (error (format "No further undo information%s" |
| 1008 | (if (and transient-mark-mode mark-active) | 1008 | (if (and transient-mark-mode mark-active) |
| 1009 | " for region" "")))) | 1009 | " for region" "")))) |
| 1010 | (let ((undo-in-progress t)) | 1010 | (let ((undo-in-progress t)) |
| 1011 | (setq pending-undo-list (primitive-undo count pending-undo-list)))) | 1011 | (setq pending-undo-list (primitive-undo count pending-undo-list)))) |
| @@ -1528,7 +1528,7 @@ specifies the value of ERROR-BUFFER." | |||
| 1528 | nil shell-command-switch command))) | 1528 | nil shell-command-switch command))) |
| 1529 | ;; Report the output. | 1529 | ;; Report the output. |
| 1530 | (with-current-buffer buffer | 1530 | (with-current-buffer buffer |
| 1531 | (setq mode-line-process | 1531 | (setq mode-line-process |
| 1532 | (cond ((null exit-status) | 1532 | (cond ((null exit-status) |
| 1533 | " - Error") | 1533 | " - Error") |
| 1534 | ((stringp exit-status) | 1534 | ((stringp exit-status) |
| @@ -1765,7 +1765,7 @@ Optional second argument REPLACE non-nil means that STRING will replace | |||
| 1765 | the front of the kill ring, rather than being added to the list. | 1765 | the front of the kill ring, rather than being added to the list. |
| 1766 | 1766 | ||
| 1767 | Optional third arguments YANK-HANDLER controls how the STRING is later | 1767 | Optional third arguments YANK-HANDLER controls how the STRING is later |
| 1768 | inserted into a buffer; see `insert-for-yank' for details. | 1768 | inserted into a buffer; see `insert-for-yank' for details. |
| 1769 | When a yank handler is specified, STRING must be non-empty (the yank | 1769 | When a yank handler is specified, STRING must be non-empty (the yank |
| 1770 | handler is stored as a `yank-handler'text property on STRING). | 1770 | handler is stored as a `yank-handler'text property on STRING). |
| 1771 | 1771 | ||
| @@ -1774,11 +1774,11 @@ argument is not used by `insert-for-yank'. However, since Lisp code | |||
| 1774 | may access and use elements from the kill-ring directly, the STRING | 1774 | may access and use elements from the kill-ring directly, the STRING |
| 1775 | argument should still be a \"useful\" string for such uses." | 1775 | argument should still be a \"useful\" string for such uses." |
| 1776 | (if (> (length string) 0) | 1776 | (if (> (length string) 0) |
| 1777 | (if yank-handler | 1777 | (if yank-handler |
| 1778 | (put-text-property 0 1 'yank-handler yank-handler string) | 1778 | (put-text-property 0 1 'yank-handler yank-handler string) |
| 1779 | (remove-list-of-text-properties 0 1 '(yank-handler) string)) | 1779 | (remove-list-of-text-properties 0 1 '(yank-handler) string)) |
| 1780 | (if yank-handler | 1780 | (if yank-handler |
| 1781 | (signal 'args-out-of-range | 1781 | (signal 'args-out-of-range |
| 1782 | (list string "yank-handler specified for empty string")))) | 1782 | (list string "yank-handler specified for empty string")))) |
| 1783 | (if (fboundp 'menu-bar-update-yank-menu) | 1783 | (if (fboundp 'menu-bar-update-yank-menu) |
| 1784 | (menu-bar-update-yank-menu string (and replace (car kill-ring)))) | 1784 | (menu-bar-update-yank-menu string (and replace (car kill-ring)))) |
| @@ -1798,7 +1798,7 @@ Optional third argument YANK-HANDLER specifies the yank-handler text | |||
| 1798 | property to be set on the combined kill ring string. If the specified | 1798 | property to be set on the combined kill ring string. If the specified |
| 1799 | yank-handler arg differs from the yank-handler property of the latest | 1799 | yank-handler arg differs from the yank-handler property of the latest |
| 1800 | kill string, STRING is added as a new kill ring element instead of | 1800 | kill string, STRING is added as a new kill ring element instead of |
| 1801 | being appending to the last kill. | 1801 | being appending to the last kill. |
| 1802 | If `interprogram-cut-function' is set, pass the resulting kill to it." | 1802 | If `interprogram-cut-function' is set, pass the resulting kill to it." |
| 1803 | (let* ((cur (car kill-ring))) | 1803 | (let* ((cur (car kill-ring))) |
| 1804 | (kill-new (if before-p (concat string cur) (concat cur string)) | 1804 | (kill-new (if before-p (concat string cur) (concat cur string)) |
| @@ -1868,7 +1868,7 @@ the text killed this time appends to the text killed last time | |||
| 1868 | to make one entry in the kill ring. | 1868 | to make one entry in the kill ring. |
| 1869 | 1869 | ||
| 1870 | In Lisp code, optional third arg YANK-HANDLER specifies the yank-handler | 1870 | In Lisp code, optional third arg YANK-HANDLER specifies the yank-handler |
| 1871 | text property to be set on the killed text. See `insert-for-yank'." | 1871 | text property to be set on the killed text. See `insert-for-yank'." |
| 1872 | (interactive "r") | 1872 | (interactive "r") |
| 1873 | (condition-case nil | 1873 | (condition-case nil |
| 1874 | (let ((string (delete-and-extract-region beg end))) | 1874 | (let ((string (delete-and-extract-region beg end))) |
| @@ -2537,7 +2537,7 @@ and it reactivates the mark. | |||
| 2537 | With prefix arg, `transient-mark-mode' is enabled temporarily." | 2537 | With prefix arg, `transient-mark-mode' is enabled temporarily." |
| 2538 | (interactive "P") | 2538 | (interactive "P") |
| 2539 | (if arg | 2539 | (if arg |
| 2540 | (if mark-active | 2540 | (if mark-active |
| 2541 | (if (null transient-mark-mode) | 2541 | (if (null transient-mark-mode) |
| 2542 | (setq transient-mark-mode 'lambda)) | 2542 | (setq transient-mark-mode 'lambda)) |
| 2543 | (setq arg nil))) | 2543 | (setq arg nil))) |
| @@ -3152,7 +3152,7 @@ Setting this variable automatically makes it local to the current buffer.") | |||
| 3152 | (not (and fill-indent-according-to-mode | 3152 | (not (and fill-indent-according-to-mode |
| 3153 | (string-match "\\`[ \t]*\\'" prefix))) | 3153 | (string-match "\\`[ \t]*\\'" prefix))) |
| 3154 | (setq fill-prefix prefix)))) | 3154 | (setq fill-prefix prefix)))) |
| 3155 | 3155 | ||
| 3156 | (while (and (not give-up) (> (current-column) fc)) | 3156 | (while (and (not give-up) (> (current-column) fc)) |
| 3157 | ;; Determine where to split the line. | 3157 | ;; Determine where to split the line. |
| 3158 | (let* (after-prefix | 3158 | (let* (after-prefix |
| @@ -3740,7 +3740,7 @@ With a prefix argument, set VARIABLE to VALUE buffer-locally." | |||
| 3740 | 3740 | ||
| 3741 | (if make-local | 3741 | (if make-local |
| 3742 | (make-local-variable var)) | 3742 | (make-local-variable var)) |
| 3743 | 3743 | ||
| 3744 | (set var val) | 3744 | (set var val) |
| 3745 | 3745 | ||
| 3746 | ;; Force a thorough redisplay for the case that the variable | 3746 | ;; Force a thorough redisplay for the case that the variable |
| @@ -3908,7 +3908,7 @@ to decide what to delete." | |||
| 3908 | (not (equal buffer | 3908 | (not (equal buffer |
| 3909 | (window-buffer (active-minibuffer-window)))))) | 3909 | (window-buffer (active-minibuffer-window)))))) |
| 3910 | (error "Minibuffer is not active for completion") | 3910 | (error "Minibuffer is not active for completion") |
| 3911 | (unless (run-hook-with-args-until-success | 3911 | (unless (run-hook-with-args-until-success |
| 3912 | 'choose-completion-string-functions | 3912 | 'choose-completion-string-functions |
| 3913 | choice buffer mini-p base-size) | 3913 | choice buffer mini-p base-size) |
| 3914 | ;; Insert the completion into the buffer where it was requested. | 3914 | ;; Insert the completion into the buffer where it was requested. |
| @@ -4405,10 +4405,10 @@ See also `normal-erase-is-backspace'." | |||
| 4405 | ; (message "You cannot modify the prompt"))) | 4405 | ; (message "You cannot modify the prompt"))) |
| 4406 | ; | 4406 | ; |
| 4407 | ; | 4407 | ; |
| 4408 | ;(setq minibuffer-prompt-properties | 4408 | ;(setq minibuffer-prompt-properties |
| 4409 | ; (list 'modification-hooks '(minibuffer-prompt-modification) | 4409 | ; (list 'modification-hooks '(minibuffer-prompt-modification) |
| 4410 | ; 'insert-in-front-hooks '(minibuffer-prompt-insertion))) | 4410 | ; 'insert-in-front-hooks '(minibuffer-prompt-insertion))) |
| 4411 | ; | 4411 | ; |
| 4412 | 4412 | ||
| 4413 | (provide 'simple) | 4413 | (provide 'simple) |
| 4414 | ;;; simple.el ends here | 4414 | ;;; simple.el ends here |
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index b8fad744afb..108eff07759 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 6 | ;; Keywords: merge diff3 cvs conflict | 6 | ;; Keywords: merge diff3 cvs conflict |
| 7 | ;; Revision: $Id: smerge-mode.el,v 1.19 2002/10/10 13:01:14 monnier Exp $ | 7 | ;; Revision: $Id: smerge-mode.el,v 1.20 2002/10/10 17:30:20 monnier Exp $ |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
| @@ -203,7 +203,7 @@ Can be nil if the style is undecided, or else: | |||
| 203 | (save-excursion (goto-char (point-min)) | 203 | (save-excursion (goto-char (point-min)) |
| 204 | (not (re-search-forward smerge-begin-re nil t)))) | 204 | (not (re-search-forward smerge-begin-re nil t)))) |
| 205 | (smerge-mode -1))) | 205 | (smerge-mode -1))) |
| 206 | 206 | ||
| 207 | 207 | ||
| 208 | (defun smerge-keep-all () | 208 | (defun smerge-keep-all () |
| 209 | "Keep all three versions. | 209 | "Keep all three versions. |
| @@ -337,7 +337,7 @@ An error is raised if not inside a conflict." | |||
| 337 | 337 | ||
| 338 | (_ (re-search-forward smerge-end-re)) | 338 | (_ (re-search-forward smerge-end-re)) |
| 339 | (_ (assert (< orig-point (match-end 0)))) | 339 | (_ (assert (< orig-point (match-end 0)))) |
| 340 | 340 | ||
| 341 | (other-end (match-beginning 0)) | 341 | (other-end (match-beginning 0)) |
| 342 | (end (match-end 0)) | 342 | (end (match-end 0)) |
| 343 | 343 | ||
| @@ -370,7 +370,7 @@ An error is raised if not inside a conflict." | |||
| 370 | (setq base-end mine-end) | 370 | (setq base-end mine-end) |
| 371 | (setq mine-start other-start) | 371 | (setq mine-start other-start) |
| 372 | (setq mine-end other-end))) | 372 | (setq mine-end other-end))) |
| 373 | 373 | ||
| 374 | (store-match-data (list start end | 374 | (store-match-data (list start end |
| 375 | mine-start mine-end | 375 | mine-start mine-end |
| 376 | base-start base-end | 376 | base-start base-end |
| @@ -469,7 +469,7 @@ buffer names." | |||
| 469 | (buffer-enable-undo) | 469 | (buffer-enable-undo) |
| 470 | (set-buffer-modified-p nil) | 470 | (set-buffer-modified-p nil) |
| 471 | (funcall mode)) | 471 | (funcall mode)) |
| 472 | 472 | ||
| 473 | (when base | 473 | (when base |
| 474 | (setq base (generate-new-buffer | 474 | (setq base (generate-new-buffer |
| 475 | (or name-base (concat "*" filename " BASE*")))) | 475 | (or name-base (concat "*" filename " BASE*")))) |
| @@ -482,7 +482,7 @@ buffer names." | |||
| 482 | (buffer-enable-undo) | 482 | (buffer-enable-undo) |
| 483 | (set-buffer-modified-p nil) | 483 | (set-buffer-modified-p nil) |
| 484 | (funcall mode))) | 484 | (funcall mode))) |
| 485 | 485 | ||
| 486 | ;; the rest of the code is inspired from vc.el | 486 | ;; the rest of the code is inspired from vc.el |
| 487 | ;; Fire up ediff. | 487 | ;; Fire up ediff. |
| 488 | (set-buffer | 488 | (set-buffer |
| @@ -491,7 +491,7 @@ buffer names." | |||
| 491 | ;; nil 'ediff-merge-revisions-with-ancestor buffer-file-name) | 491 | ;; nil 'ediff-merge-revisions-with-ancestor buffer-file-name) |
| 492 | (ediff-merge-buffers mine other))) | 492 | (ediff-merge-buffers mine other))) |
| 493 | ;; nil 'ediff-merge-revisions buffer-file-name))) | 493 | ;; nil 'ediff-merge-revisions buffer-file-name))) |
| 494 | 494 | ||
| 495 | ;; Ediff is now set up, and we are in the control buffer. | 495 | ;; Ediff is now set up, and we are in the control buffer. |
| 496 | ;; Do a few further adjustments and take precautions for exit. | 496 | ;; Do a few further adjustments and take precautions for exit. |
| 497 | (set (make-local-variable 'smerge-ediff-windows) config) | 497 | (set (make-local-variable 'smerge-ediff-windows) config) |
diff --git a/lisp/sort.el b/lisp/sort.el index 09123f42ab7..e7390aed512 100644 --- a/lisp/sort.el +++ b/lisp/sort.el | |||
| @@ -97,7 +97,7 @@ same as ENDRECFUN." | |||
| 97 | ((consp (car (car sort-lists))) | 97 | ((consp (car (car sort-lists))) |
| 98 | (function | 98 | (function |
| 99 | (lambda (a b) | 99 | (lambda (a b) |
| 100 | (> 0 (compare-buffer-substrings | 100 | (> 0 (compare-buffer-substrings |
| 101 | nil (car a) (cdr a) | 101 | nil (car a) (cdr a) |
| 102 | nil (car b) (cdr b)))))) | 102 | nil (car b) (cdr b)))))) |
| 103 | (t | 103 | (t |
| @@ -108,7 +108,7 @@ same as ENDRECFUN." | |||
| 108 | ((consp (car (car sort-lists))) | 108 | ((consp (car (car sort-lists))) |
| 109 | (function | 109 | (function |
| 110 | (lambda (a b) | 110 | (lambda (a b) |
| 111 | (> 0 (compare-buffer-substrings | 111 | (> 0 (compare-buffer-substrings |
| 112 | nil (car (car a)) (cdr (car a)) | 112 | nil (car (car a)) (cdr (car a)) |
| 113 | nil (car (car b)) (cdr (car b))))))) | 113 | nil (car (car b)) (cdr (car b))))))) |
| 114 | (t | 114 | (t |
| @@ -205,7 +205,7 @@ same as ENDRECFUN." | |||
| 205 | (delete-region min (1+ min)))))) | 205 | (delete-region min (1+ min)))))) |
| 206 | 206 | ||
| 207 | ;;;###autoload | 207 | ;;;###autoload |
| 208 | (defun sort-lines (reverse beg end) | 208 | (defun sort-lines (reverse beg end) |
| 209 | "Sort lines in region alphabetically; argument means descending order. | 209 | "Sort lines in region alphabetically; argument means descending order. |
| 210 | Called from a program, there are three arguments: | 210 | Called from a program, there are three arguments: |
| 211 | REVERSE (non-nil means reverse order), BEG and END (region to sort). | 211 | REVERSE (non-nil means reverse order), BEG and END (region to sort). |
| @@ -429,7 +429,7 @@ For example: to sort lines in the region by the first word on each line | |||
| 429 | ;; using negative prefix arg to mean "reverse" is now inconsistent with | 429 | ;; using negative prefix arg to mean "reverse" is now inconsistent with |
| 430 | ;; other sort-.*fields functions but then again this was before, since it | 430 | ;; other sort-.*fields functions but then again this was before, since it |
| 431 | ;; didn't use the magnitude of the arg to specify anything. | 431 | ;; didn't use the magnitude of the arg to specify anything. |
| 432 | (interactive "P\nsRegexp specifying records to sort: | 432 | (interactive "P\nsRegexp specifying records to sort: |
| 433 | sRegexp specifying key within record: \nr") | 433 | sRegexp specifying key within record: \nr") |
| 434 | (cond ((or (equal key-regexp "") (equal key-regexp "\\&")) | 434 | (cond ((or (equal key-regexp "") (equal key-regexp "\\&")) |
| 435 | (setq key-regexp 0)) | 435 | (setq key-regexp 0)) |
diff --git a/lisp/soundex.el b/lisp/soundex.el index 89094e326e4..f0c5445817a 100644 --- a/lisp/soundex.el +++ b/lisp/soundex.el | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | ;; Copyright (C) 1993 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1993 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Christian Plaunt <chris@bliss.berkeley.edu> | 5 | ;; Author: Christian Plaunt <chris@bliss.berkeley.edu> |
| 6 | ;; Maintainer: FSF | 6 | ;; Maintainer: FSF |
| 7 | ;; Keywords: matching | 7 | ;; Keywords: matching |
| 8 | ;; Created: Sat May 15 14:48:18 1993 | 8 | ;; Created: Sat May 15 14:48:18 1993 |
| 9 | 9 | ||
diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 9af94658f0b..992571e9c15 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el | |||
| @@ -932,7 +932,7 @@ This basically creates a sparse keymap, and makes it's parent be | |||
| 932 | (looking-at "[0-9]+: *\\[[+-]\\] [^ \n]+ \\*?[!#]$"))] | 932 | (looking-at "[0-9]+: *\\[[+-]\\] [^ \n]+ \\*?[!#]$"))] |
| 933 | ) | 933 | ) |
| 934 | "Additional menu items while in file-mode.") | 934 | "Additional menu items while in file-mode.") |
| 935 | 935 | ||
| 936 | (defvar speedbar-easymenu-definition-trailer | 936 | (defvar speedbar-easymenu-definition-trailer |
| 937 | (append | 937 | (append |
| 938 | (if (and (featurep 'custom) (fboundp 'custom-declare-variable)) | 938 | (if (and (featurep 'custom) (fboundp 'custom-declare-variable)) |
| @@ -981,7 +981,7 @@ directories.") | |||
| 981 | (if (fboundp 'frame-parameter) | 981 | (if (fboundp 'frame-parameter) |
| 982 | 982 | ||
| 983 | (defalias 'speedbar-frame-parameter 'frame-parameter) | 983 | (defalias 'speedbar-frame-parameter 'frame-parameter) |
| 984 | 984 | ||
| 985 | (defun speedbar-frame-parameter (frame parameter) | 985 | (defun speedbar-frame-parameter (frame parameter) |
| 986 | "Return FRAME's PARAMETER value." | 986 | "Return FRAME's PARAMETER value." |
| 987 | (cdr (assoc parameter (frame-parameters frame))))) | 987 | (cdr (assoc parameter (frame-parameters frame))))) |
| @@ -2325,7 +2325,7 @@ position to insert a new item, and that the new item will end with a CR." | |||
| 2325 | (if tag-button-function 'speedbar-highlight-face nil) | 2325 | (if tag-button-function 'speedbar-highlight-face nil) |
| 2326 | tag-button-function tag-button-data)) | 2326 | tag-button-function tag-button-data)) |
| 2327 | )) | 2327 | )) |
| 2328 | 2328 | ||
| 2329 | (defun speedbar-change-expand-button-char (char) | 2329 | (defun speedbar-change-expand-button-char (char) |
| 2330 | "Change the expansion button character to CHAR for the current line." | 2330 | "Change the expansion button character to CHAR for the current line." |
| 2331 | (save-excursion | 2331 | (save-excursion |
| @@ -2639,7 +2639,7 @@ name will have the function FIND-FUN and not token." | |||
| 2639 | (speedbar-insert-generic-list indent lst | 2639 | (speedbar-insert-generic-list indent lst |
| 2640 | 'speedbar-tag-expand | 2640 | 'speedbar-tag-expand |
| 2641 | 'speedbar-tag-find)) | 2641 | 'speedbar-tag-find)) |
| 2642 | 2642 | ||
| 2643 | (defun speedbar-insert-etags-list (indent lst) | 2643 | (defun speedbar-insert-etags-list (indent lst) |
| 2644 | "At level INDENT, insert the etags generated LST." | 2644 | "At level INDENT, insert the etags generated LST." |
| 2645 | (speedbar-insert-generic-list indent lst | 2645 | (speedbar-insert-generic-list indent lst |
| @@ -3343,7 +3343,7 @@ directory with these items. This function is replaceable in | |||
| 3343 | `speedbar-mode-functions-list' as `speedbar-line-path'." | 3343 | `speedbar-mode-functions-list' as `speedbar-line-path'." |
| 3344 | (let ((rf (speedbar-fetch-replacement-function 'speedbar-line-path))) | 3344 | (let ((rf (speedbar-fetch-replacement-function 'speedbar-line-path))) |
| 3345 | (if rf (funcall rf depth) default-directory))) | 3345 | (if rf (funcall rf depth) default-directory))) |
| 3346 | 3346 | ||
| 3347 | (defun speedbar-files-line-path (&optional depth) | 3347 | (defun speedbar-files-line-path (&optional depth) |
| 3348 | "Retrieve the pathname associated with the current line. | 3348 | "Retrieve the pathname associated with the current line. |
| 3349 | This may require traversing backwards from DEPTH and combining the default | 3349 | This may require traversing backwards from DEPTH and combining the default |
| @@ -3427,12 +3427,12 @@ With universal argument ARG, flush cached data." | |||
| 3427 | (forward-char -2) | 3427 | (forward-char -2) |
| 3428 | (speedbar-do-function-pointer)) | 3428 | (speedbar-do-function-pointer)) |
| 3429 | (error (speedbar-position-cursor-on-line))))) | 3429 | (error (speedbar-position-cursor-on-line))))) |
| 3430 | 3430 | ||
| 3431 | (defun speedbar-flush-expand-line () | 3431 | (defun speedbar-flush-expand-line () |
| 3432 | "Expand the line under the cursor and flush any cached information." | 3432 | "Expand the line under the cursor and flush any cached information." |
| 3433 | (interactive) | 3433 | (interactive) |
| 3434 | (speedbar-expand-line 1)) | 3434 | (speedbar-expand-line 1)) |
| 3435 | 3435 | ||
| 3436 | (defun speedbar-contract-line () | 3436 | (defun speedbar-contract-line () |
| 3437 | "Contract the line under the cursor." | 3437 | "Contract the line under the cursor." |
| 3438 | (interactive) | 3438 | (interactive) |
| @@ -4194,7 +4194,7 @@ TEXT is the buffer's name, TOKEN and INDENT are unused." | |||
| 4194 | (defalias 'defimage-speedbar 'defimage) | 4194 | (defalias 'defimage-speedbar 'defimage) |
| 4195 | 4195 | ||
| 4196 | (if (not (fboundp 'make-glyph)) | 4196 | (if (not (fboundp 'make-glyph)) |
| 4197 | 4197 | ||
| 4198 | (defmacro defimage-speedbar (variable imagespec docstring) | 4198 | (defmacro defimage-speedbar (variable imagespec docstring) |
| 4199 | "Don't bother loading up an image... | 4199 | "Don't bother loading up an image... |
| 4200 | Argument VARIABLE is the variable to define. | 4200 | Argument VARIABLE is the variable to define. |
diff --git a/lisp/startup.el b/lisp/startup.el index 4ec30fd26b3..fcc69704d40 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -366,7 +366,7 @@ from being initialized." | |||
| 366 | More precisely, this uses only the subdirectories whose names | 366 | More precisely, this uses only the subdirectories whose names |
| 367 | start with letters or digits; it excludes any subdirectory named `RCS' | 367 | start with letters or digits; it excludes any subdirectory named `RCS' |
| 368 | or `CVS', and any subdirectory that contains a file named `.nosearch'." | 368 | or `CVS', and any subdirectory that contains a file named `.nosearch'." |
| 369 | (let (dirs | 369 | (let (dirs |
| 370 | attrs | 370 | attrs |
| 371 | (pending (list default-directory))) | 371 | (pending (list default-directory))) |
| 372 | ;; This loop does a breadth-first tree walk on DIR's subtree, | 372 | ;; This loop does a breadth-first tree walk on DIR's subtree, |
| @@ -485,7 +485,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 485 | (make-directory | 485 | (make-directory |
| 486 | (file-name-directory auto-save-list-file-prefix) | 486 | (file-name-directory auto-save-list-file-prefix) |
| 487 | t) | 487 | t) |
| 488 | (concat | 488 | (concat |
| 489 | (make-temp-name | 489 | (make-temp-name |
| 490 | (expand-file-name | 490 | (expand-file-name |
| 491 | auto-save-list-file-prefix)) | 491 | auto-save-list-file-prefix)) |
| @@ -880,7 +880,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 880 | ;; Run the site-start library if it exists. The point of this file is | 880 | ;; Run the site-start library if it exists. The point of this file is |
| 881 | ;; that it is run before .emacs. There is no point in doing this after | 881 | ;; that it is run before .emacs. There is no point in doing this after |
| 882 | ;; .emacs; that is useless. | 882 | ;; .emacs; that is useless. |
| 883 | (if site-run-file | 883 | (if site-run-file |
| 884 | (load site-run-file t t)) | 884 | (load site-run-file t t)) |
| 885 | 885 | ||
| 886 | ;; Sites should not disable this. Only individuals should disable | 886 | ;; Sites should not disable this. Only individuals should disable |
| @@ -907,7 +907,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 907 | (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$") | 907 | (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$") |
| 908 | "~/.emacs" | 908 | "~/.emacs" |
| 909 | "~/_emacs")) | 909 | "~/_emacs")) |
| 910 | ((eq system-type 'vax-vms) | 910 | ((eq system-type 'vax-vms) |
| 911 | "sys$login:.emacs") | 911 | "sys$login:.emacs") |
| 912 | (t | 912 | (t |
| 913 | (concat "~" init-file-user "/.emacs"))))) | 913 | (concat "~" init-file-user "/.emacs"))))) |
| @@ -915,7 +915,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 915 | ;; into user-init-file. | 915 | ;; into user-init-file. |
| 916 | (setq user-init-file t) | 916 | (setq user-init-file t) |
| 917 | (load user-init-file-1 t t) | 917 | (load user-init-file-1 t t) |
| 918 | 918 | ||
| 919 | (when (eq user-init-file t) | 919 | (when (eq user-init-file t) |
| 920 | ;; If we did not find ~/.emacs, try | 920 | ;; If we did not find ~/.emacs, try |
| 921 | ;; ~/.emacs.d/.emacs. | 921 | ;; ~/.emacs.d/.emacs. |
| @@ -933,7 +933,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 933 | ;; Don't let it be set from default.el. | 933 | ;; Don't let it be set from default.el. |
| 934 | (when (eq user-init-file t) | 934 | (when (eq user-init-file t) |
| 935 | (setq user-init-file user-init-file-1)))) | 935 | (setq user-init-file user-init-file-1)))) |
| 936 | 936 | ||
| 937 | ;; If we loaded a compiled file, set | 937 | ;; If we loaded a compiled file, set |
| 938 | ;; `user-init-file' to the source version if that | 938 | ;; `user-init-file' to the source version if that |
| 939 | ;; exists. | 939 | ;; exists. |
| @@ -951,13 +951,13 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 951 | source user-init-file) | 951 | source user-init-file) |
| 952 | (sit-for 1)) | 952 | (sit-for 1)) |
| 953 | (setq user-init-file source)))) | 953 | (setq user-init-file source)))) |
| 954 | 954 | ||
| 955 | (when (and (stringp custom-file) | 955 | (when (and (stringp custom-file) |
| 956 | (not (assoc custom-file load-history))) | 956 | (not (assoc custom-file load-history))) |
| 957 | ;; If the .emacs file has set `custom-file' but hasn't | 957 | ;; If the .emacs file has set `custom-file' but hasn't |
| 958 | ;; loaded the file yet, let's load it. | 958 | ;; loaded the file yet, let's load it. |
| 959 | (load custom-file t t)) | 959 | (load custom-file t t)) |
| 960 | 960 | ||
| 961 | (or inhibit-default-init | 961 | (or inhibit-default-init |
| 962 | (let ((inhibit-startup-message nil)) | 962 | (let ((inhibit-startup-message nil)) |
| 963 | ;; Users are supposed to be told their rights. | 963 | ;; Users are supposed to be told their rights. |
| @@ -1025,7 +1025,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 1025 | ;; originally done before unibyte was set and is sensitive to | 1025 | ;; originally done before unibyte was set and is sensitive to |
| 1026 | ;; unibyte (display table, terminal coding system &c). | 1026 | ;; unibyte (display table, terminal coding system &c). |
| 1027 | (set-language-environment current-language-environment))) | 1027 | (set-language-environment current-language-environment))) |
| 1028 | 1028 | ||
| 1029 | ;; Do this here in case the init file sets mail-host-address. | 1029 | ;; Do this here in case the init file sets mail-host-address. |
| 1030 | (if (equal user-mail-address "") | 1030 | (if (equal user-mail-address "") |
| 1031 | (setq user-mail-address (concat (user-login-name) "@" | 1031 | (setq user-mail-address (concat (user-login-name) "@" |
| @@ -1039,7 +1039,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 1039 | (eq font-list-limit old-font-list-limit) | 1039 | (eq font-list-limit old-font-list-limit) |
| 1040 | (eq face-ignored-fonts old-face-ignored-fonts)) | 1040 | (eq face-ignored-fonts old-face-ignored-fonts)) |
| 1041 | (clear-face-cache))) | 1041 | (clear-face-cache))) |
| 1042 | 1042 | ||
| 1043 | (run-hooks 'after-init-hook) | 1043 | (run-hooks 'after-init-hook) |
| 1044 | 1044 | ||
| 1045 | ;; If *scratch* exists and init file didn't change its mode, initialize it. | 1045 | ;; If *scratch* exists and init file didn't change its mode, initialize it. |
| @@ -1047,7 +1047,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 1047 | (with-current-buffer "*scratch*" | 1047 | (with-current-buffer "*scratch*" |
| 1048 | (if (eq major-mode 'fundamental-mode) | 1048 | (if (eq major-mode 'fundamental-mode) |
| 1049 | (funcall initial-major-mode)))) | 1049 | (funcall initial-major-mode)))) |
| 1050 | 1050 | ||
| 1051 | ;; Load library for our terminal type. | 1051 | ;; Load library for our terminal type. |
| 1052 | ;; User init file can set term-file-prefix to nil to prevent this. | 1052 | ;; User init file can set term-file-prefix to nil to prevent this. |
| 1053 | (and term-file-prefix (not noninteractive) (not window-system) | 1053 | (and term-file-prefix (not noninteractive) (not window-system) |
| @@ -1310,7 +1310,7 @@ where FACE is a valid face specification, as it can be used with | |||
| 1310 | display-hourglass nil | 1310 | display-hourglass nil |
| 1311 | minor-mode-map-alist nil | 1311 | minor-mode-map-alist nil |
| 1312 | buffer-undo-list t | 1312 | buffer-undo-list t |
| 1313 | mode-line-format (propertize "---- %b %-" | 1313 | mode-line-format (propertize "---- %b %-" |
| 1314 | 'face '(:weight bold)) | 1314 | 'face '(:weight bold)) |
| 1315 | fancy-splash-stop-time (+ (float-time) | 1315 | fancy-splash-stop-time (+ (float-time) |
| 1316 | (max 60 fancy-splash-max-time)) | 1316 | (max 60 fancy-splash-max-time)) |
| @@ -1357,7 +1357,7 @@ we put it on this frame." | |||
| 1357 | (unwind-protect | 1357 | (unwind-protect |
| 1358 | (with-current-buffer (get-buffer-create "GNU Emacs") | 1358 | (with-current-buffer (get-buffer-create "GNU Emacs") |
| 1359 | (let ((tab-width 8) | 1359 | (let ((tab-width 8) |
| 1360 | (mode-line-format (propertize "---- %b %-" | 1360 | (mode-line-format (propertize "---- %b %-" |
| 1361 | 'face '(:weight bold)))) | 1361 | 'face '(:weight bold)))) |
| 1362 | 1362 | ||
| 1363 | ;; The convention for this piece of code is that | 1363 | ;; The convention for this piece of code is that |
| @@ -1448,7 +1448,7 @@ Copyright (C) 2002 Free Software Foundation, Inc.") | |||
| 1448 | (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) | 1448 | (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) |
| 1449 | (eq (key-binding "\C-h\C-d") 'describe-distribution) | 1449 | (eq (key-binding "\C-h\C-d") 'describe-distribution) |
| 1450 | (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) | 1450 | (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) |
| 1451 | (insert | 1451 | (insert |
| 1452 | "\n | 1452 | "\n |
| 1453 | GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for full details. | 1453 | GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for full details. |
| 1454 | Emacs is Free Software--Free as in Freedom--so you can redistribute copies | 1454 | Emacs is Free Software--Free as in Freedom--so you can redistribute copies |
diff --git a/lisp/strokes.el b/lisp/strokes.el index 1aa04d74524..b230bfdeb6b 100644 --- a/lisp/strokes.el +++ b/lisp/strokes.el | |||
| @@ -1498,11 +1498,11 @@ Encode/decode your strokes with \\[strokes-encode-buffer], | |||
| 1498 | (defsubst strokes-xpm-encode-length-as-string (length) | 1498 | (defsubst strokes-xpm-encode-length-as-string (length) |
| 1499 | "Given some LENGTH in [0,62) do a fast lookup of its encoding." | 1499 | "Given some LENGTH in [0,62) do a fast lookup of its encoding." |
| 1500 | (aref strokes-base64-chars length)) | 1500 | (aref strokes-base64-chars length)) |
| 1501 | 1501 | ||
| 1502 | (defsubst strokes-xpm-decode-char (character) | 1502 | (defsubst strokes-xpm-decode-char (character) |
| 1503 | "Given a CHARACTER, do a fast lookup to find its corresponding integer value." | 1503 | "Given a CHARACTER, do a fast lookup to find its corresponding integer value." |
| 1504 | (aref strokes-char-table character)) | 1504 | (aref strokes-char-table character)) |
| 1505 | 1505 | ||
| 1506 | (defun strokes-xpm-to-compressed-string (&optional xpm-buffer) | 1506 | (defun strokes-xpm-to-compressed-string (&optional xpm-buffer) |
| 1507 | "Convert XPM in XPM-BUFFER to compressed string representing the stroke. | 1507 | "Convert XPM in XPM-BUFFER to compressed string representing the stroke. |
| 1508 | XPM-BUFFER defaults to ` *strokes-xpm*'." | 1508 | XPM-BUFFER defaults to ` *strokes-xpm*'." |
diff --git a/lisp/subr.el b/lisp/subr.el index 8b0005a644f..01d317238de 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -1058,7 +1058,7 @@ This is the last value stored with `(process-put PROCESS PROPNAME VALUE)'." | |||
| 1058 | (defun process-put (process propname value) | 1058 | (defun process-put (process propname value) |
| 1059 | "Change PROCESS' PROPNAME property to VALUE. | 1059 | "Change PROCESS' PROPNAME property to VALUE. |
| 1060 | It can be retrieved with `(process-get PROCESS PROPNAME)'." | 1060 | It can be retrieved with `(process-get PROCESS PROPNAME)'." |
| 1061 | (set-process-plist process | 1061 | (set-process-plist process |
| 1062 | (plist-put (process-plist process) propname value))) | 1062 | (plist-put (process-plist process) propname value))) |
| 1063 | 1063 | ||
| 1064 | 1064 | ||
| @@ -1480,7 +1480,7 @@ If NOEXCLUDE is present and non-nil, the normal removal of the | |||
| 1480 | if FUNCTION adjusts point before or after inserting the object. | 1480 | if FUNCTION adjusts point before or after inserting the object. |
| 1481 | If UNDO is present and non-nil, it is a function that will be called | 1481 | If UNDO is present and non-nil, it is a function that will be called |
| 1482 | by `yank-pop' to undo the insertion of the current object. It is | 1482 | by `yank-pop' to undo the insertion of the current object. It is |
| 1483 | called with two arguments, the start and end of the current region. | 1483 | called with two arguments, the start and end of the current region. |
| 1484 | FUNCTION may set `yank-undo-function' to override the UNDO value." | 1484 | FUNCTION may set `yank-undo-function' to override the UNDO value." |
| 1485 | (let* ((handler (and (stringp string) | 1485 | (let* ((handler (and (stringp string) |
| 1486 | (get-text-property 0 'yank-handler string))) | 1486 | (get-text-property 0 'yank-handler string))) |
| @@ -1496,7 +1496,7 @@ If UNDO is present and non-nil, it is a function that will be called | |||
| 1496 | (setq yank-undo-function (nth 3 handler))) ;; UNDO | 1496 | (setq yank-undo-function (nth 3 handler))) ;; UNDO |
| 1497 | (if (nth 4 handler) ;; COMMAND | 1497 | (if (nth 4 handler) ;; COMMAND |
| 1498 | (setq this-command (nth 4 handler))))) | 1498 | (setq this-command (nth 4 handler))))) |
| 1499 | 1499 | ||
| 1500 | (defun insert-buffer-substring-no-properties (buf &optional start end) | 1500 | (defun insert-buffer-substring-no-properties (buf &optional start end) |
| 1501 | "Insert before point a substring of buffer BUFFER, without text properties. | 1501 | "Insert before point a substring of buffer BUFFER, without text properties. |
| 1502 | BUFFER may be a buffer or a buffer name. | 1502 | BUFFER may be a buffer or a buffer name. |
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index 2c755fd176e..b83e168ff57 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | ;; This code now understands the extra fields that GNU tar adds to tar files. | 41 | ;; This code now understands the extra fields that GNU tar adds to tar files. |
| 42 | 42 | ||
| 43 | ;; This interacts correctly with "uncompress.el" in the Emacs library, | 43 | ;; This interacts correctly with "uncompress.el" in the Emacs library, |
| 44 | ;; which you get with | 44 | ;; which you get with |
| 45 | ;; | 45 | ;; |
| 46 | ;; (autoload 'uncompress-while-visiting "uncompress") | 46 | ;; (autoload 'uncompress-while-visiting "uncompress") |
| 47 | ;; (setq auto-mode-alist (cons '("\\.Z$" . uncompress-while-visiting) | 47 | ;; (setq auto-mode-alist (cons '("\\.Z$" . uncompress-while-visiting) |
| @@ -49,11 +49,11 @@ | |||
| 49 | ;; | 49 | ;; |
| 50 | ;; Do not attempt to use tar-mode.el with crypt.el, you will lose. | 50 | ;; Do not attempt to use tar-mode.el with crypt.el, you will lose. |
| 51 | 51 | ||
| 52 | ;; *************** TO DO *************** | 52 | ;; *************** TO DO *************** |
| 53 | ;; | 53 | ;; |
| 54 | ;; o chmod should understand "a+x,og-w". | 54 | ;; o chmod should understand "a+x,og-w". |
| 55 | ;; | 55 | ;; |
| 56 | ;; o It's not possible to add a NEW file to a tar archive; not that | 56 | ;; o It's not possible to add a NEW file to a tar archive; not that |
| 57 | ;; important, but still... | 57 | ;; important, but still... |
| 58 | ;; | 58 | ;; |
| 59 | ;; o The code is less efficient that it could be - in a lot of places, I | 59 | ;; o The code is less efficient that it could be - in a lot of places, I |
| @@ -64,7 +64,7 @@ | |||
| 64 | ;; of an archive, where <esc> would leave you in a subfile-edit buffer. | 64 | ;; of an archive, where <esc> would leave you in a subfile-edit buffer. |
| 65 | ;; (Like the Meta-R command of the Zmacs mail reader.) | 65 | ;; (Like the Meta-R command of the Zmacs mail reader.) |
| 66 | ;; | 66 | ;; |
| 67 | ;; o Sometimes (but not always) reverting the tar-file buffer does not | 67 | ;; o Sometimes (but not always) reverting the tar-file buffer does not |
| 68 | ;; re-grind the listing, and you are staring at the binary tar data. | 68 | ;; re-grind the listing, and you are staring at the binary tar data. |
| 69 | ;; Typing 'g' again immediately after that will always revert and re-grind | 69 | ;; Typing 'g' again immediately after that will always revert and re-grind |
| 70 | ;; it, though. I have no idea why this happens. | 70 | ;; it, though. I have no idea why this happens. |
| @@ -76,7 +76,7 @@ | |||
| 76 | ;; might be a problem if the tar write-file-hook does not come *first* on | 76 | ;; might be a problem if the tar write-file-hook does not come *first* on |
| 77 | ;; the list. | 77 | ;; the list. |
| 78 | ;; | 78 | ;; |
| 79 | ;; o Block files, sparse files, continuation files, and the various header | 79 | ;; o Block files, sparse files, continuation files, and the various header |
| 80 | ;; types aren't editable. Actually I don't know that they work at all. | 80 | ;; types aren't editable. Actually I don't know that they work at all. |
| 81 | 81 | ||
| 82 | ;; Rationale: | 82 | ;; Rationale: |
| @@ -103,7 +103,7 @@ | |||
| 103 | (defcustom tar-anal-blocksize 20 | 103 | (defcustom tar-anal-blocksize 20 |
| 104 | "*The blocksize of tar files written by Emacs, or nil, meaning don't care. | 104 | "*The blocksize of tar files written by Emacs, or nil, meaning don't care. |
| 105 | The blocksize of a tar file is not really the size of the blocks; rather, it is | 105 | The blocksize of a tar file is not really the size of the blocks; rather, it is |
| 106 | the number of blocks written with one system call. When tarring to a tape, | 106 | the number of blocks written with one system call. When tarring to a tape, |
| 107 | this is the size of the *tape* blocks, but when writing to a file, it doesn't | 107 | this is the size of the *tape* blocks, but when writing to a file, it doesn't |
| 108 | matter much. The only noticeable difference is that if a tar file does not | 108 | matter much. The only noticeable difference is that if a tar file does not |
| 109 | have a blocksize of 20, tar will tell you that; all this really controls is | 109 | have a blocksize of 20, tar will tell you that; all this really controls is |
| @@ -117,7 +117,7 @@ If this is true, then editing and saving a tar file entry back into its | |||
| 117 | tar file will update its datestamp. If false, the datestamp is unchanged. | 117 | tar file will update its datestamp. If false, the datestamp is unchanged. |
| 118 | You may or may not want this - it is good in that you can tell when a file | 118 | You may or may not want this - it is good in that you can tell when a file |
| 119 | in a tar archive has been changed, but it is bad for the same reason that | 119 | in a tar archive has been changed, but it is bad for the same reason that |
| 120 | editing a file in the tar archive at all is bad - the changed version of | 120 | editing a file in the tar archive at all is bad - the changed version of |
| 121 | the file never exists on disk." | 121 | the file never exists on disk." |
| 122 | :type 'boolean | 122 | :type 'boolean |
| 123 | :group 'tar) | 123 | :group 'tar) |
| @@ -201,7 +201,7 @@ This information is useful, but it takes screen space away from file names." | |||
| 201 | 201 | ||
| 202 | (defun tar-header-block-tokenize (string) | 202 | (defun tar-header-block-tokenize (string) |
| 203 | "Return a `tar-header' structure. | 203 | "Return a `tar-header' structure. |
| 204 | This is a list of name, mode, uid, gid, size, | 204 | This is a list of name, mode, uid, gid, size, |
| 205 | write-date, checksum, link-type, and link-name." | 205 | write-date, checksum, link-type, and link-name." |
| 206 | (cond ((< (length string) 512) nil) | 206 | (cond ((< (length string) 512) nil) |
| 207 | (;(some 'plusp string) ; <-- oops, massive cycle hog! | 207 | (;(some 'plusp string) ; <-- oops, massive cycle hog! |
| @@ -555,15 +555,15 @@ is visible (and the real data of the buffer is hidden)." | |||
| 555 | ;;;###autoload | 555 | ;;;###autoload |
| 556 | (define-derived-mode tar-mode nil "Tar" | 556 | (define-derived-mode tar-mode nil "Tar" |
| 557 | "Major mode for viewing a tar file as a dired-like listing of its contents. | 557 | "Major mode for viewing a tar file as a dired-like listing of its contents. |
| 558 | You can move around using the usual cursor motion commands. | 558 | You can move around using the usual cursor motion commands. |
| 559 | Letters no longer insert themselves. | 559 | Letters no longer insert themselves. |
| 560 | Type `e' to pull a file out of the tar file and into its own buffer; | 560 | Type `e' to pull a file out of the tar file and into its own buffer; |
| 561 | or click mouse-2 on the file's line in the Tar mode buffer. | 561 | or click mouse-2 on the file's line in the Tar mode buffer. |
| 562 | Type `c' to copy an entry from the tar file into another file on disk. | 562 | Type `c' to copy an entry from the tar file into another file on disk. |
| 563 | 563 | ||
| 564 | If you edit a sub-file of this archive (as with the `e' command) and | 564 | If you edit a sub-file of this archive (as with the `e' command) and |
| 565 | save it with Control-x Control-s, the contents of that buffer will be | 565 | save it with Control-x Control-s, the contents of that buffer will be |
| 566 | saved back into the tar-file buffer; in this way you can edit a file | 566 | saved back into the tar-file buffer; in this way you can edit a file |
| 567 | inside of a tar archive without extracting it and re-archiving it. | 567 | inside of a tar archive without extracting it and re-archiving it. |
| 568 | 568 | ||
| 569 | See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. | 569 | See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. |
| @@ -764,7 +764,7 @@ appear on disk when you save the tar-file's buffer." | |||
| 764 | (decode-coding-region (point-min) (point-max) coding) | 764 | (decode-coding-region (point-min) (point-max) coding) |
| 765 | (set-buffer-file-coding-system coding)) | 765 | (set-buffer-file-coding-system coding)) |
| 766 | ;; Set the default-directory to the dir of the | 766 | ;; Set the default-directory to the dir of the |
| 767 | ;; superior buffer. | 767 | ;; superior buffer. |
| 768 | (setq default-directory | 768 | (setq default-directory |
| 769 | (save-excursion | 769 | (save-excursion |
| 770 | (set-buffer tar-buffer) | 770 | (set-buffer tar-buffer) |
| @@ -775,7 +775,7 @@ appear on disk when you save the tar-file's buffer." | |||
| 775 | (make-local-variable 'tar-superior-descriptor) | 775 | (make-local-variable 'tar-superior-descriptor) |
| 776 | (setq tar-superior-buffer tar-buffer) | 776 | (setq tar-superior-buffer tar-buffer) |
| 777 | (setq tar-superior-descriptor descriptor) | 777 | (setq tar-superior-descriptor descriptor) |
| 778 | (setq buffer-read-only read-only-p) | 778 | (setq buffer-read-only read-only-p) |
| 779 | (set-buffer-modified-p nil) | 779 | (set-buffer-modified-p nil) |
| 780 | (tar-subfile-mode 1)) | 780 | (tar-subfile-mode 1)) |
| 781 | (set-buffer tar-buffer)) | 781 | (set-buffer tar-buffer)) |
| @@ -1064,7 +1064,7 @@ for this to be permanent." | |||
| 1064 | (delete-region p (point)) | 1064 | (delete-region p (point)) |
| 1065 | (insert (tar-header-block-summarize tokens) "\n") | 1065 | (insert (tar-header-block-summarize tokens) "\n") |
| 1066 | (setq tar-header-offset (position-bytes (point-max)))) | 1066 | (setq tar-header-offset (position-bytes (point-max)))) |
| 1067 | 1067 | ||
| 1068 | (widen) | 1068 | (widen) |
| 1069 | (set-buffer-multibyte nil) | 1069 | (set-buffer-multibyte nil) |
| 1070 | (let* ((start (+ (tar-desc-data-start descriptor) tar-header-offset -513))) | 1070 | (let* ((start (+ (tar-desc-data-start descriptor) tar-header-offset -513))) |
diff --git a/lisp/tempo.el b/lisp/tempo.el index 4c58a4bca9a..f5a592f5ad5 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el | |||
| @@ -279,7 +279,7 @@ The elements in ELEMENTS can be of several types: | |||
| 279 | (command-name template-name)) | 279 | (command-name template-name)) |
| 280 | (set template-name elements) | 280 | (set template-name elements) |
| 281 | (fset command-name (list 'lambda (list '&optional 'arg) | 281 | (fset command-name (list 'lambda (list '&optional 'arg) |
| 282 | (or documentation | 282 | (or documentation |
| 283 | (concat "Insert a " name ".")) | 283 | (concat "Insert a " name ".")) |
| 284 | (list 'interactive "*P") | 284 | (list 'interactive "*P") |
| 285 | (list 'tempo-insert-template (list 'quote | 285 | (list 'tempo-insert-template (list 'quote |
| @@ -540,7 +540,7 @@ and insert the results." | |||
| 540 | (setq lp (cdr lp))) | 540 | (setq lp (cdr lp))) |
| 541 | (if (not (= mark (car lp))) | 541 | (if (not (= mark (car lp))) |
| 542 | (setcdr lp (cons mark (cdr lp)))))))) | 542 | (setcdr lp (cons mark (cdr lp)))))))) |
| 543 | 543 | ||
| 544 | ;;; | 544 | ;;; |
| 545 | ;;; tempo-forward-mark | 545 | ;;; tempo-forward-mark |
| 546 | 546 | ||
| @@ -577,7 +577,7 @@ and insert the results." | |||
| 577 | last)))) | 577 | last)))) |
| 578 | (if prev-mark | 578 | (if prev-mark |
| 579 | (goto-char prev-mark)))) | 579 | (goto-char prev-mark)))) |
| 580 | 580 | ||
| 581 | ;;; | 581 | ;;; |
| 582 | ;;; tempo-add-tag | 582 | ;;; tempo-add-tag |
| 583 | 583 | ||
diff --git a/lisp/term.el b/lisp/term.el index bb3c9cb9e53..9f49ee96045 100644 --- a/lisp/term.el +++ b/lisp/term.el | |||
| @@ -2688,7 +2688,7 @@ See `term-prompt-regexp'." | |||
| 2688 | (term-move-columns columns) | 2688 | (term-move-columns columns) |
| 2689 | (delete-region pos (point)))) | 2689 | (delete-region pos (point)))) |
| 2690 | (setq term-current-column nil) | 2690 | (setq term-current-column nil) |
| 2691 | 2691 | ||
| 2692 | (put-text-property old-point (point) | 2692 | (put-text-property old-point (point) |
| 2693 | 'face term-current-face) | 2693 | 'face term-current-face) |
| 2694 | ;; If the last char was written in last column, | 2694 | ;; If the last char was written in last column, |
| @@ -3739,7 +3739,7 @@ See `term-dynamic-complete-filename'. Returns t if successful." | |||
| 3739 | (t (car term-completion-addsuffix)))) | 3739 | (t (car term-completion-addsuffix)))) |
| 3740 | (filesuffix (cond ((not term-completion-addsuffix) "") | 3740 | (filesuffix (cond ((not term-completion-addsuffix) "") |
| 3741 | ((not (consp term-completion-addsuffix)) " ") | 3741 | ((not (consp term-completion-addsuffix)) " ") |
| 3742 | (t (cdr term-completion-addsuffix)))) | 3742 | (t (cdr term-completion-addsuffix)))) |
| 3743 | (filename (or (term-match-partial-filename) "")) | 3743 | (filename (or (term-match-partial-filename) "")) |
| 3744 | (pathdir (file-name-directory filename)) | 3744 | (pathdir (file-name-directory filename)) |
| 3745 | (pathnondir (file-name-nondirectory filename)) | 3745 | (pathnondir (file-name-nondirectory filename)) |
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el index 70f25da673a..4dd56862913 100644 --- a/lisp/thingatpt.el +++ b/lisp/thingatpt.el | |||
| @@ -32,11 +32,11 @@ | |||
| 32 | ;; forward-"thing" operator (eg. forward-word, forward-line). | 32 | ;; forward-"thing" operator (eg. forward-word, forward-line). |
| 33 | ;; | 33 | ;; |
| 34 | ;; Special cases are allowed for using properties associated with the named | 34 | ;; Special cases are allowed for using properties associated with the named |
| 35 | ;; "thing": | 35 | ;; "thing": |
| 36 | ;; | 36 | ;; |
| 37 | ;; forward-op Function to call to skip forward over a "thing" (or | 37 | ;; forward-op Function to call to skip forward over a "thing" (or |
| 38 | ;; with a negative argument, backward). | 38 | ;; with a negative argument, backward). |
| 39 | ;; | 39 | ;; |
| 40 | ;; beginning-op Function to call to skip to the beginning of a "thing". | 40 | ;; beginning-op Function to call to skip to the beginning of a "thing". |
| 41 | ;; end-op Function to call to skip to the end of a "thing". | 41 | ;; end-op Function to call to skip to the end of a "thing". |
| 42 | ;; | 42 | ;; |
| @@ -80,14 +80,14 @@ of the textual entity that was found." | |||
| 80 | (condition-case nil | 80 | (condition-case nil |
| 81 | (save-excursion | 81 | (save-excursion |
| 82 | ;; Try moving forward, then back. | 82 | ;; Try moving forward, then back. |
| 83 | (let ((end (progn | 83 | (let ((end (progn |
| 84 | (funcall | 84 | (funcall |
| 85 | (or (get thing 'end-op) | 85 | (or (get thing 'end-op) |
| 86 | (function (lambda () (forward-thing thing 1))))) | 86 | (function (lambda () (forward-thing thing 1))))) |
| 87 | (point))) | 87 | (point))) |
| 88 | (beg (progn | 88 | (beg (progn |
| 89 | (funcall | 89 | (funcall |
| 90 | (or (get thing 'beginning-op) | 90 | (or (get thing 'beginning-op) |
| 91 | (function (lambda () (forward-thing thing -1))))) | 91 | (function (lambda () (forward-thing thing -1))))) |
| 92 | (point)))) | 92 | (point)))) |
| 93 | (if (not (and beg (> beg orig))) | 93 | (if (not (and beg (> beg orig))) |
| @@ -95,9 +95,9 @@ of the textual entity that was found." | |||
| 95 | ;; it worked. But END may not be the real end. | 95 | ;; it worked. But END may not be the real end. |
| 96 | ;; So find the real end that corresponds to BEG. | 96 | ;; So find the real end that corresponds to BEG. |
| 97 | (let ((real-end | 97 | (let ((real-end |
| 98 | (progn | 98 | (progn |
| 99 | (funcall | 99 | (funcall |
| 100 | (or (get thing 'end-op) | 100 | (or (get thing 'end-op) |
| 101 | (function (lambda () (forward-thing thing 1))))) | 101 | (function (lambda () (forward-thing thing 1))))) |
| 102 | (point)))) | 102 | (point)))) |
| 103 | (if (and beg real-end (<= beg orig) (<= orig real-end)) | 103 | (if (and beg real-end (<= beg orig) (<= orig real-end)) |
| @@ -105,20 +105,20 @@ of the textual entity that was found." | |||
| 105 | (goto-char orig) | 105 | (goto-char orig) |
| 106 | ;; Try a second time, moving backward first and then forward, | 106 | ;; Try a second time, moving backward first and then forward, |
| 107 | ;; so that we can find a thing that ends at ORIG. | 107 | ;; so that we can find a thing that ends at ORIG. |
| 108 | (let ((beg (progn | 108 | (let ((beg (progn |
| 109 | (funcall | 109 | (funcall |
| 110 | (or (get thing 'beginning-op) | 110 | (or (get thing 'beginning-op) |
| 111 | (function (lambda () (forward-thing thing -1))))) | 111 | (function (lambda () (forward-thing thing -1))))) |
| 112 | (point))) | 112 | (point))) |
| 113 | (end (progn | 113 | (end (progn |
| 114 | (funcall | 114 | (funcall |
| 115 | (or (get thing 'end-op) | 115 | (or (get thing 'end-op) |
| 116 | (function (lambda () (forward-thing thing 1))))) | 116 | (function (lambda () (forward-thing thing 1))))) |
| 117 | (point))) | 117 | (point))) |
| 118 | (real-beg | 118 | (real-beg |
| 119 | (progn | 119 | (progn |
| 120 | (funcall | 120 | (funcall |
| 121 | (or (get thing 'beginning-op) | 121 | (or (get thing 'beginning-op) |
| 122 | (function (lambda () (forward-thing thing -1))))) | 122 | (function (lambda () (forward-thing thing -1))))) |
| 123 | (point)))) | 123 | (point)))) |
| 124 | (if (and real-beg end (<= real-beg orig) (<= orig end)) | 124 | (if (and real-beg end (<= real-beg orig) (<= orig end)) |
| @@ -137,7 +137,7 @@ a symbol as a valid THING." | |||
| 137 | (if (get thing 'thing-at-point) | 137 | (if (get thing 'thing-at-point) |
| 138 | (funcall (get thing 'thing-at-point)) | 138 | (funcall (get thing 'thing-at-point)) |
| 139 | (let ((bounds (bounds-of-thing-at-point thing))) | 139 | (let ((bounds (bounds-of-thing-at-point thing))) |
| 140 | (if bounds | 140 | (if bounds |
| 141 | (buffer-substring (car bounds) (cdr bounds)))))) | 141 | (buffer-substring (car bounds) (cdr bounds)))))) |
| 142 | 142 | ||
| 143 | ;; Go to beginning/end | 143 | ;; Go to beginning/end |
| @@ -152,9 +152,9 @@ a symbol as a valid THING." | |||
| 152 | (or bounds (error "No %s here" thing)) | 152 | (or bounds (error "No %s here" thing)) |
| 153 | (goto-char (cdr bounds)))) | 153 | (goto-char (cdr bounds)))) |
| 154 | 154 | ||
| 155 | ;; Special cases | 155 | ;; Special cases |
| 156 | 156 | ||
| 157 | ;; Lines | 157 | ;; Lines |
| 158 | 158 | ||
| 159 | ;; bolp will be false when you click on the last line in the buffer | 159 | ;; bolp will be false when you click on the last line in the buffer |
| 160 | ;; and it has no final newline. | 160 | ;; and it has no final newline. |
| @@ -162,7 +162,7 @@ a symbol as a valid THING." | |||
| 162 | (put 'line 'beginning-op | 162 | (put 'line 'beginning-op |
| 163 | (function (lambda () (if (bolp) (forward-line -1) (beginning-of-line))))) | 163 | (function (lambda () (if (bolp) (forward-line -1) (beginning-of-line))))) |
| 164 | 164 | ||
| 165 | ;; Sexps | 165 | ;; Sexps |
| 166 | 166 | ||
| 167 | (defun in-string-p () | 167 | (defun in-string-p () |
| 168 | (let ((orig (point))) | 168 | (let ((orig (point))) |
| @@ -188,7 +188,7 @@ a symbol as a valid THING." | |||
| 188 | 188 | ||
| 189 | (put 'sexp 'beginning-op 'beginning-of-sexp) | 189 | (put 'sexp 'beginning-op 'beginning-of-sexp) |
| 190 | 190 | ||
| 191 | ;; Lists | 191 | ;; Lists |
| 192 | 192 | ||
| 193 | (put 'list 'end-op (function (lambda () (up-list 1)))) | 193 | (put 'list 'end-op (function (lambda () (up-list 1)))) |
| 194 | (put 'list 'beginning-op 'backward-sexp) | 194 | (put 'list 'beginning-op 'backward-sexp) |
| @@ -198,7 +198,7 @@ a symbol as a valid THING." | |||
| 198 | (defvar thing-at-point-file-name-chars "-~/[:alnum:]_.${}#%,:" | 198 | (defvar thing-at-point-file-name-chars "-~/[:alnum:]_.${}#%,:" |
| 199 | "Characters allowable in filenames.") | 199 | "Characters allowable in filenames.") |
| 200 | 200 | ||
| 201 | (put 'filename 'end-op | 201 | (put 'filename 'end-op |
| 202 | (lambda () | 202 | (lambda () |
| 203 | (re-search-forward (concat "\\=[" thing-at-point-file-name-chars "]*") | 203 | (re-search-forward (concat "\\=[" thing-at-point-file-name-chars "]*") |
| 204 | nil t))) | 204 | nil t))) |
| @@ -339,11 +339,11 @@ point." | |||
| 339 | (goto-char (car bounds)) | 339 | (goto-char (car bounds)) |
| 340 | (error "No URL here")))))) | 340 | (error "No URL here")))))) |
| 341 | 341 | ||
| 342 | ;; Whitespace | 342 | ;; Whitespace |
| 343 | 343 | ||
| 344 | (defun forward-whitespace (arg) | 344 | (defun forward-whitespace (arg) |
| 345 | (interactive "p") | 345 | (interactive "p") |
| 346 | (if (natnump arg) | 346 | (if (natnump arg) |
| 347 | (re-search-forward "[ \t]+\\|\n" nil 'move arg) | 347 | (re-search-forward "[ \t]+\\|\n" nil 'move arg) |
| 348 | (while (< arg 0) | 348 | (while (< arg 0) |
| 349 | (if (re-search-backward "[ \t]+\\|\n" nil 'move) | 349 | (if (re-search-backward "[ \t]+\\|\n" nil 'move) |
| @@ -351,35 +351,35 @@ point." | |||
| 351 | (skip-chars-backward " \t"))) | 351 | (skip-chars-backward " \t"))) |
| 352 | (setq arg (1+ arg))))) | 352 | (setq arg (1+ arg))))) |
| 353 | 353 | ||
| 354 | ;; Buffer | 354 | ;; Buffer |
| 355 | 355 | ||
| 356 | (put 'buffer 'end-op (lambda () (goto-char (point-max)))) | 356 | (put 'buffer 'end-op (lambda () (goto-char (point-max)))) |
| 357 | (put 'buffer 'beginning-op (lambda () (goto-char (point-min)))) | 357 | (put 'buffer 'beginning-op (lambda () (goto-char (point-min)))) |
| 358 | 358 | ||
| 359 | ;; Symbols | 359 | ;; Symbols |
| 360 | 360 | ||
| 361 | (defun forward-symbol (arg) | 361 | (defun forward-symbol (arg) |
| 362 | (interactive "p") | 362 | (interactive "p") |
| 363 | (if (natnump arg) | 363 | (if (natnump arg) |
| 364 | (re-search-forward "\\(\\sw\\|\\s_\\)+" nil 'move arg) | 364 | (re-search-forward "\\(\\sw\\|\\s_\\)+" nil 'move arg) |
| 365 | (while (< arg 0) | 365 | (while (< arg 0) |
| 366 | (if (re-search-backward "\\(\\sw\\|\\s_\\)+" nil 'move) | 366 | (if (re-search-backward "\\(\\sw\\|\\s_\\)+" nil 'move) |
| 367 | (skip-syntax-backward "w_")) | 367 | (skip-syntax-backward "w_")) |
| 368 | (setq arg (1+ arg))))) | 368 | (setq arg (1+ arg))))) |
| 369 | 369 | ||
| 370 | ;; Syntax blocks | 370 | ;; Syntax blocks |
| 371 | 371 | ||
| 372 | (defun forward-same-syntax (&optional arg) | 372 | (defun forward-same-syntax (&optional arg) |
| 373 | (interactive "p") | 373 | (interactive "p") |
| 374 | (while (< arg 0) | 374 | (while (< arg 0) |
| 375 | (skip-syntax-backward | 375 | (skip-syntax-backward |
| 376 | (char-to-string (char-syntax (char-after (1- (point)))))) | 376 | (char-to-string (char-syntax (char-after (1- (point)))))) |
| 377 | (setq arg (1+ arg))) | 377 | (setq arg (1+ arg))) |
| 378 | (while (> arg 0) | 378 | (while (> arg 0) |
| 379 | (skip-syntax-forward (char-to-string (char-syntax (char-after (point))))) | 379 | (skip-syntax-forward (char-to-string (char-syntax (char-after (point))))) |
| 380 | (setq arg (1- arg)))) | 380 | (setq arg (1- arg)))) |
| 381 | 381 | ||
| 382 | ;; Aliases | 382 | ;; Aliases |
| 383 | 383 | ||
| 384 | (defun word-at-point () (thing-at-point 'word)) | 384 | (defun word-at-point () (thing-at-point 'word)) |
| 385 | (defun sentence-at-point () (thing-at-point 'sentence)) | 385 | (defun sentence-at-point () (thing-at-point 'sentence)) |
| @@ -388,7 +388,7 @@ point." | |||
| 388 | "Read a lisp expression from STR. | 388 | "Read a lisp expression from STR. |
| 389 | Signal an error if the entire string was not used." | 389 | Signal an error if the entire string was not used." |
| 390 | (let* ((read-data (read-from-string str)) | 390 | (let* ((read-data (read-from-string str)) |
| 391 | (more-left | 391 | (more-left |
| 392 | (condition-case nil | 392 | (condition-case nil |
| 393 | ;; The call to `ignore' suppresses a compiler warning. | 393 | ;; The call to `ignore' suppresses a compiler warning. |
| 394 | (progn (ignore (read-from-string (substring str (cdr read-data)))) | 394 | (progn (ignore (read-from-string (substring str (cdr read-data)))) |
| @@ -398,8 +398,8 @@ Signal an error if the entire string was not used." | |||
| 398 | (error "Can't read whole string") | 398 | (error "Can't read whole string") |
| 399 | (car read-data)))) | 399 | (car read-data)))) |
| 400 | 400 | ||
| 401 | (defun form-at-point (&optional thing pred) | 401 | (defun form-at-point (&optional thing pred) |
| 402 | (let ((sexp (condition-case nil | 402 | (let ((sexp (condition-case nil |
| 403 | (read-from-whole-string (thing-at-point (or thing 'sexp))) | 403 | (read-from-whole-string (thing-at-point (or thing 'sexp))) |
| 404 | (error nil)))) | 404 | (error nil)))) |
| 405 | (if (or (not pred) (funcall pred sexp)) sexp))) | 405 | (if (or (not pred) (funcall pred sexp)) sexp))) |
diff --git a/lisp/timer.el b/lisp/timer.el index 3131fe3c175..b7db0d01dc1 100644 --- a/lisp/timer.el +++ b/lisp/timer.el | |||
| @@ -261,7 +261,7 @@ TIME is a time-list." | |||
| 261 | (let ((high (- (car time) (aref timer 1))) | 261 | (let ((high (- (car time) (aref timer 1))) |
| 262 | (low (- (nth 1 time) (aref timer 2)))) | 262 | (low (- (nth 1 time) (aref timer 2)))) |
| 263 | (+ low (* high 65536)))) | 263 | (+ low (* high 65536)))) |
| 264 | 264 | ||
| 265 | (defun timer-event-handler (timer) | 265 | (defun timer-event-handler (timer) |
| 266 | "Call the handler for the timer TIMER. | 266 | "Call the handler for the timer TIMER. |
| 267 | This function is called, by name, directly by the C code." | 267 | This function is called, by name, directly by the C code." |
diff --git a/lisp/tooltip.el b/lisp/tooltip.el index 363f6f4be97..ea5aaaa87d6 100644 --- a/lisp/tooltip.el +++ b/lisp/tooltip.el | |||
| @@ -286,7 +286,7 @@ ACTIVATEP non-nil means activate mouse motion events." | |||
| 286 | 286 | ||
| 287 | (defun tooltip-set-param (alist key value) | 287 | (defun tooltip-set-param (alist key value) |
| 288 | "Change the value of KEY in alist ALIST to VALUE. | 288 | "Change the value of KEY in alist ALIST to VALUE. |
| 289 | If there's no association for KEY in ALIST, add one, otherwise | 289 | If there's no association for KEY in ALIST, add one, otherwise |
| 290 | change the existing association. Value is the resulting alist." | 290 | change the existing association. Value is the resulting alist." |
| 291 | (let ((param (assq key alist))) | 291 | (let ((param (assq key alist))) |
| 292 | (if (consp param) | 292 | (if (consp param) |
| @@ -321,7 +321,7 @@ position." | |||
| 321 | tooltip-hide-delay | 321 | tooltip-hide-delay |
| 322 | tooltip-x-offset | 322 | tooltip-x-offset |
| 323 | tooltip-y-offset)) | 323 | tooltip-y-offset)) |
| 324 | (error | 324 | (error |
| 325 | (message "Error while displaying tooltip: %s" error) | 325 | (message "Error while displaying tooltip: %s" error) |
| 326 | (sit-for 1) | 326 | (sit-for 1) |
| 327 | (message "%s" text))))) | 327 | (message "%s" text))))) |
| @@ -411,7 +411,7 @@ This event can be examined by forms in TOOLTIP-GUD-DISPLAY.") | |||
| 411 | (message "Dereferencing is now %s." | 411 | (message "Dereferencing is now %s." |
| 412 | (if tooltip-gud-dereference "on" "off")))) | 412 | (if tooltip-gud-dereference "on" "off")))) |
| 413 | 413 | ||
| 414 | ; This will only display data that comes in one chunk. | 414 | ; This will only display data that comes in one chunk. |
| 415 | ; Larger arrays (say 400 elements) are displayed in | 415 | ; Larger arrays (say 400 elements) are displayed in |
| 416 | ; the tootip incompletely and spill over into the gud buffer. | 416 | ; the tootip incompletely and spill over into the gud buffer. |
| 417 | ; Switching the process-filter creates timing problems and | 417 | ; Switching the process-filter creates timing problems and |
| @@ -455,16 +455,16 @@ This function must return nil if it doesn't handle EVENT." | |||
| 455 | (let ((cmd (tooltip-gud-print-command expr))) | 455 | (let ((cmd (tooltip-gud-print-command expr))) |
| 456 | (unless (null cmd) ; CMD can be nil if unknown debugger | 456 | (unless (null cmd) ; CMD can be nil if unknown debugger |
| 457 | (case gud-minor-mode | 457 | (case gud-minor-mode |
| 458 | (gdba (gdb-enqueue-input | 458 | (gdba (gdb-enqueue-input |
| 459 | (list (concat cmd "\n") 'gdb-tooltip-print))) | 459 | (list (concat cmd "\n") 'gdb-tooltip-print))) |
| 460 | (t | 460 | (t |
| 461 | (setq tooltip-gud-original-filter (process-filter process)) | 461 | (setq tooltip-gud-original-filter (process-filter process)) |
| 462 | (set-process-filter process 'tooltip-gud-process-output) | 462 | (set-process-filter process 'tooltip-gud-process-output) |
| 463 | (gud-basic-call cmd))) | 463 | (gud-basic-call cmd))) |
| 464 | expr))))))) | 464 | expr))))))) |
| 465 | 465 | ||
| 466 | (defun gdb-tooltip-print () | 466 | (defun gdb-tooltip-print () |
| 467 | (tooltip-show | 467 | (tooltip-show |
| 468 | (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer) | 468 | (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer) |
| 469 | (buffer-string)))) | 469 | (buffer-string)))) |
| 470 | 470 | ||
| @@ -488,7 +488,7 @@ MSG is either a help string to display, or nil to cancel the display." | |||
| 488 | ;; Keep what we have. | 488 | ;; Keep what we have. |
| 489 | ) | 489 | ) |
| 490 | (t | 490 | (t |
| 491 | ;; A different help. Remove a previous tooltip, and | 491 | ;; A different help. Remove a previous tooltip, and |
| 492 | ;; display a new one, with some delay. | 492 | ;; display a new one, with some delay. |
| 493 | (tooltip-hide) | 493 | (tooltip-hide) |
| 494 | (tooltip-start-delayed-tip))))) | 494 | (tooltip-start-delayed-tip))))) |
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index 23686006ac5..334590700f9 100644 --- a/lisp/vc-rcs.el +++ b/lisp/vc-rcs.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | 7 | ||
| 8 | ;; $Id: vc-rcs.el,v 1.34 2003/01/03 15:27:35 spiegel Exp $ | 8 | ;; $Id: vc-rcs.el,v 1.35 2003/01/07 08:28:15 spiegel Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -143,9 +143,9 @@ For a description of possible values, see `vc-check-master-templates'." | |||
| 143 | (cond | 143 | (cond |
| 144 | ((string-match ".rw..-..-." (nth 8 (file-attributes file))) | 144 | ((string-match ".rw..-..-." (nth 8 (file-attributes file))) |
| 145 | (vc-file-setprop file 'vc-checkout-model 'implicit) | 145 | (vc-file-setprop file 'vc-checkout-model 'implicit) |
| 146 | (setq state | 146 | (setq state |
| 147 | (if (vc-rcs-workfile-is-newer file) | 147 | (if (vc-rcs-workfile-is-newer file) |
| 148 | 'edited | 148 | 'edited |
| 149 | 'up-to-date))) | 149 | 'up-to-date))) |
| 150 | ((string-match ".r-..-..-." (nth 8 (file-attributes file))) | 150 | ((string-match ".r-..-..-." (nth 8 (file-attributes file))) |
| 151 | (vc-file-setprop file 'vc-checkout-model 'locking)))) | 151 | (vc-file-setprop file 'vc-checkout-model 'locking)))) |
| @@ -162,7 +162,7 @@ For a description of possible values, see `vc-check-master-templates'." | |||
| 162 | (if (file-ownership-preserved-p file) | 162 | (if (file-ownership-preserved-p file) |
| 163 | 'edited | 163 | 'edited |
| 164 | (vc-user-login-name owner-uid)) | 164 | (vc-user-login-name owner-uid)) |
| 165 | (if (vc-rcs-workfile-is-newer file) | 165 | (if (vc-rcs-workfile-is-newer file) |
| 166 | 'edited | 166 | 'edited |
| 167 | 'up-to-date))) | 167 | 'up-to-date))) |
| 168 | (t | 168 | (t |
| @@ -243,7 +243,7 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." | |||
| 243 | (if (stringp vc-rcs-register-switches) | 243 | (if (stringp vc-rcs-register-switches) |
| 244 | (list vc-rcs-register-switches) | 244 | (list vc-rcs-register-switches) |
| 245 | vc-rcs-register-switches)))) | 245 | vc-rcs-register-switches)))) |
| 246 | 246 | ||
| 247 | (and (not (file-exists-p subdir)) | 247 | (and (not (file-exists-p subdir)) |
| 248 | (not (directory-files (file-name-directory file) | 248 | (not (directory-files (file-name-directory file) |
| 249 | nil ".*,v$" t)) | 249 | nil ".*,v$" t)) |
| @@ -305,7 +305,7 @@ whether to remove it." | |||
| 305 | (and (string= (file-name-nondirectory (directory-file-name dir)) "RCS") | 305 | (and (string= (file-name-nondirectory (directory-file-name dir)) "RCS") |
| 306 | ;; check whether RCS dir is empty, i.e. it does not | 306 | ;; check whether RCS dir is empty, i.e. it does not |
| 307 | ;; contain any files except "." and ".." | 307 | ;; contain any files except "." and ".." |
| 308 | (not (directory-files dir nil | 308 | (not (directory-files dir nil |
| 309 | "^\\([^.]\\|\\.[^.]\\|\\.\\.[^.]\\).*")) | 309 | "^\\([^.]\\|\\.[^.]\\|\\.\\.[^.]\\).*")) |
| 310 | (yes-or-no-p (format "Directory %s is empty; remove it? " dir)) | 310 | (yes-or-no-p (format "Directory %s is empty; remove it? " dir)) |
| 311 | (delete-directory dir)))) | 311 | (delete-directory dir)))) |
| @@ -317,7 +317,7 @@ whether to remove it." | |||
| 317 | vc-checkin-switches))) | 317 | vc-checkin-switches))) |
| 318 | (let ((old-version (vc-workfile-version file)) new-version | 318 | (let ((old-version (vc-workfile-version file)) new-version |
| 319 | (default-branch (vc-file-getprop file 'vc-rcs-default-branch))) | 319 | (default-branch (vc-file-getprop file 'vc-rcs-default-branch))) |
| 320 | ;; Force branch creation if an appropriate | 320 | ;; Force branch creation if an appropriate |
| 321 | ;; default branch has been set. | 321 | ;; default branch has been set. |
| 322 | (and (not rev) | 322 | (and (not rev) |
| 323 | default-branch | 323 | default-branch |
| @@ -351,7 +351,7 @@ whether to remove it." | |||
| 351 | ((and old-version new-version | 351 | ((and old-version new-version |
| 352 | (not (string= (vc-branch-part old-version) | 352 | (not (string= (vc-branch-part old-version) |
| 353 | (vc-branch-part new-version)))) | 353 | (vc-branch-part new-version)))) |
| 354 | (vc-rcs-set-default-branch file | 354 | (vc-rcs-set-default-branch file |
| 355 | (if (vc-trunk-p new-version) nil | 355 | (if (vc-trunk-p new-version) nil |
| 356 | (vc-branch-part new-version))) | 356 | (vc-branch-part new-version))) |
| 357 | ;; If this is an old RCS release, we might have | 357 | ;; If this is an old RCS release, we might have |
| @@ -407,7 +407,7 @@ whether to remove it." | |||
| 407 | (concat "-r" rev) | 407 | (concat "-r" rev) |
| 408 | (let ((workrev (vc-workfile-version file))) | 408 | (let ((workrev (vc-workfile-version file))) |
| 409 | (if workrev | 409 | (if workrev |
| 410 | (concat "-r" | 410 | (concat "-r" |
| 411 | (if (not rev) | 411 | (if (not rev) |
| 412 | ;; no revision specified: | 412 | ;; no revision specified: |
| 413 | ;; use current workfile version | 413 | ;; use current workfile version |
| @@ -428,7 +428,7 @@ whether to remove it." | |||
| 428 | (vc-file-setprop file 'vc-workfile-version new-version) | 428 | (vc-file-setprop file 'vc-workfile-version new-version) |
| 429 | ;; if necessary, adjust the default branch | 429 | ;; if necessary, adjust the default branch |
| 430 | (and rev (not (string= rev "")) | 430 | (and rev (not (string= rev "")) |
| 431 | (vc-rcs-set-default-branch | 431 | (vc-rcs-set-default-branch |
| 432 | file | 432 | file |
| 433 | (if (vc-rcs-latest-on-branch-p file new-version) | 433 | (if (vc-rcs-latest-on-branch-p file new-version) |
| 434 | (if (vc-trunk-p new-version) nil | 434 | (if (vc-trunk-p new-version) nil |
| @@ -439,7 +439,7 @@ whether to remove it." | |||
| 439 | (defun vc-rcs-revert (file &optional contents-done) | 439 | (defun vc-rcs-revert (file &optional contents-done) |
| 440 | "Revert FILE to the version it was based on." | 440 | "Revert FILE to the version it was based on." |
| 441 | (vc-do-command nil 0 "co" (vc-name file) "-f" | 441 | (vc-do-command nil 0 "co" (vc-name file) "-f" |
| 442 | (concat (if (eq (vc-state file) 'edited) "-u" "-r") | 442 | (concat (if (eq (vc-state file) 'edited) "-u" "-r") |
| 443 | (vc-workfile-version file)))) | 443 | (vc-workfile-version file)))) |
| 444 | 444 | ||
| 445 | (defun vc-rcs-cancel-version (file editable) | 445 | (defun vc-rcs-cancel-version (file editable) |
| @@ -483,7 +483,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION." | |||
| 483 | "Steal the lock on the current workfile for FILE and revision REV. | 483 | "Steal the lock on the current workfile for FILE and revision REV. |
| 484 | Needs RCS 5.6.2 or later for -M." | 484 | Needs RCS 5.6.2 or later for -M." |
| 485 | (vc-do-command nil 0 "rcs" (vc-name file) "-M" (concat "-u" rev)) | 485 | (vc-do-command nil 0 "rcs" (vc-name file) "-M" (concat "-u" rev)) |
| 486 | ;; Do a real checkout after stealing the lock, so that we see | 486 | ;; Do a real checkout after stealing the lock, so that we see |
| 487 | ;; expanded headers. | 487 | ;; expanded headers. |
| 488 | (vc-do-command nil 0 "co" (vc-name file) "-f" (concat "-l" rev))) | 488 | (vc-do-command nil 0 "co" (vc-name file) "-f" (concat "-l" rev))) |
| 489 | 489 | ||
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el index 99737ae2c59..ac11190a77f 100644 --- a/lisp/vc-sccs.el +++ b/lisp/vc-sccs.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | 7 | ||
| 8 | ;; $Id: vc-sccs.el,v 1.19 2002/11/13 12:37:58 spiegel Exp $ | 8 | ;; $Id: vc-sccs.el,v 1.20 2002/12/26 14:07:15 spiegel Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -28,10 +28,10 @@ | |||
| 28 | 28 | ||
| 29 | ;;; Code: | 29 | ;;; Code: |
| 30 | 30 | ||
| 31 | (eval-when-compile | 31 | (eval-when-compile |
| 32 | (require 'vc)) | 32 | (require 'vc)) |
| 33 | 33 | ||
| 34 | ;;; | 34 | ;;; |
| 35 | ;;; Customization options | 35 | ;;; Customization options |
| 36 | ;;; | 36 | ;;; |
| 37 | 37 | ||
| @@ -242,7 +242,7 @@ locked. REV is the revision to check out." | |||
| 242 | ;; the file in the right place. | 242 | ;; the file in the right place. |
| 243 | (setq default-directory (file-name-directory file)) | 243 | (setq default-directory (file-name-directory file)) |
| 244 | 244 | ||
| 245 | (and rev (or (string= rev "") | 245 | (and rev (or (string= rev "") |
| 246 | (not (stringp rev))) | 246 | (not (stringp rev))) |
| 247 | (setq rev nil)) | 247 | (setq rev nil)) |
| 248 | (apply 'vc-do-command nil 0 "get" (vc-name file) | 248 | (apply 'vc-do-command nil 0 "get" (vc-name file) |
| @@ -294,7 +294,7 @@ EDITABLE non-nil means previous version should be locked." | |||
| 294 | "Get a difference report using SCCS between two versions of FILE." | 294 | "Get a difference report using SCCS between two versions of FILE." |
| 295 | (setq oldvers (vc-sccs-lookup-triple file oldvers)) | 295 | (setq oldvers (vc-sccs-lookup-triple file oldvers)) |
| 296 | (setq newvers (vc-sccs-lookup-triple file newvers)) | 296 | (setq newvers (vc-sccs-lookup-triple file newvers)) |
| 297 | (apply 'vc-do-command "*vc-diff*" 1 "vcdiff" (vc-name file) | 297 | (apply 'vc-do-command "*vc-diff*" 1 "vcdiff" (vc-name file) |
| 298 | (append (list "-q" | 298 | (append (list "-q" |
| 299 | (and oldvers (concat "-r" oldvers)) | 299 | (and oldvers (concat "-r" oldvers)) |
| 300 | (and newvers (concat "-r" newvers))) | 300 | (and newvers (concat "-r" newvers))) |
diff --git a/lisp/vc.el b/lisp/vc.el index 1176d71b41a..3b7074df6a7 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | ;; Keywords: tools | 7 | ;; Keywords: tools |
| 8 | 8 | ||
| 9 | ;; $Id: vc.el,v 1.346 2002/11/03 15:08:29 spiegel Exp $ | 9 | ;; $Id: vc.el,v 1.347 2002/12/26 14:04:21 spiegel Exp $ |
| 10 | 10 | ||
| 11 | ;; This file is part of GNU Emacs. | 11 | ;; This file is part of GNU Emacs. |
| 12 | 12 | ||
| @@ -148,7 +148,7 @@ | |||
| 148 | ;; contents with those of the master version. If the backend does not | 148 | ;; contents with those of the master version. If the backend does not |
| 149 | ;; have such a brief-comparison feature, the default implementation of | 149 | ;; have such a brief-comparison feature, the default implementation of |
| 150 | ;; this function can be used, which delegates to a full | 150 | ;; this function can be used, which delegates to a full |
| 151 | ;; vc-BACKEND-diff. (Note that vc-BACKEND-diff must not run | 151 | ;; vc-BACKEND-diff. (Note that vc-BACKEND-diff must not run |
| 152 | ;; asynchronously in this case.) | 152 | ;; asynchronously in this case.) |
| 153 | ;; | 153 | ;; |
| 154 | ;; - mode-line-string (file) | 154 | ;; - mode-line-string (file) |
| @@ -722,7 +722,7 @@ The keys are \(BUFFER . BACKEND\). See also `vc-annotate-get-backend'.") | |||
| 722 | (defun vc-default-previous-version (backend file rev) | 722 | (defun vc-default-previous-version (backend file rev) |
| 723 | "Guess the version number immediately preceding REV for FILE. | 723 | "Guess the version number immediately preceding REV for FILE. |
| 724 | This default implementation works for <major>.<minor>-style version numbers | 724 | This default implementation works for <major>.<minor>-style version numbers |
| 725 | as used by RCS and CVS." | 725 | as used by RCS and CVS." |
| 726 | (let ((branch (vc-branch-part rev)) | 726 | (let ((branch (vc-branch-part rev)) |
| 727 | (minor-num (string-to-number (vc-minor-part rev)))) | 727 | (minor-num (string-to-number (vc-minor-part rev)))) |
| 728 | (when branch | 728 | (when branch |
| @@ -782,7 +782,7 @@ somebody else, signal error." | |||
| 782 | (error (format "File not under version control: `%s'" file))) | 782 | (error (format "File not under version control: `%s'" file))) |
| 783 | (unless (vc-editable-p ,filevar) | 783 | (unless (vc-editable-p ,filevar) |
| 784 | (let ((state (vc-state ,filevar))) | 784 | (let ((state (vc-state ,filevar))) |
| 785 | (if (stringp state) | 785 | (if (stringp state) |
| 786 | (error (format "`%s' is locking `%s'" state ,filevar)) | 786 | (error (format "`%s' is locking `%s'" state ,filevar)) |
| 787 | (vc-checkout ,filevar t)))) | 787 | (vc-checkout ,filevar t)))) |
| 788 | (save-excursion | 788 | (save-excursion |
| @@ -1787,7 +1787,7 @@ versions of all registered files in or below it." | |||
| 1787 | (setq rel1-default (vc-workfile-version file))) | 1787 | (setq rel1-default (vc-workfile-version file))) |
| 1788 | ;; if the file is not locked, use last and previous version as default | 1788 | ;; if the file is not locked, use last and previous version as default |
| 1789 | (t | 1789 | (t |
| 1790 | (setq rel1-default (vc-call previous-version file | 1790 | (setq rel1-default (vc-call previous-version file |
| 1791 | (vc-workfile-version file))) | 1791 | (vc-workfile-version file))) |
| 1792 | (if (string= rel1-default "") (setq rel1-default nil)) | 1792 | (if (string= rel1-default "") (setq rel1-default nil)) |
| 1793 | (setq rel2-default (vc-workfile-version file)))) | 1793 | (setq rel2-default (vc-workfile-version file)))) |
| @@ -2187,7 +2187,7 @@ There is a special command, `*l', to mark all files currently locked." | |||
| 2187 | Replace various columns with version control information, VC-INFO. | 2187 | Replace various columns with version control information, VC-INFO. |
| 2188 | This code, like dired, assumes UNIX -l format." | 2188 | This code, like dired, assumes UNIX -l format." |
| 2189 | (beginning-of-line) | 2189 | (beginning-of-line) |
| 2190 | (when (re-search-forward | 2190 | (when (re-search-forward |
| 2191 | ;; Match link count, owner, group, size. Group may be missing, | 2191 | ;; Match link count, owner, group, size. Group may be missing, |
| 2192 | ;; and only the size is present in OS/2 -l format. | 2192 | ;; and only the size is present in OS/2 -l format. |
| 2193 | "^..[drwxlts-]+ \\( *[0-9]+\\( [^ ]+ +\\([^ ]+ +\\)?[0-9]+\\)?\\) " | 2193 | "^..[drwxlts-]+ \\( *[0-9]+\\( [^ ]+ +\\([^ ]+ +\\)?[0-9]+\\)?\\) " |
| @@ -2514,7 +2514,7 @@ changes found in the master file; use \\[universal-argument] \\[vc-next-action] | |||
| 2514 | "Update the current buffer's file to the latest version on its branch. | 2514 | "Update the current buffer's file to the latest version on its branch. |
| 2515 | If the file contains no changes, and is not locked, then this simply replaces | 2515 | If the file contains no changes, and is not locked, then this simply replaces |
| 2516 | the working file with the latest version on its branch. If the file contains | 2516 | the working file with the latest version on its branch. If the file contains |
| 2517 | changes, and the backend supports merging news, then any recent changes from | 2517 | changes, and the backend supports merging news, then any recent changes from |
| 2518 | the current branch are merged into the working file." | 2518 | the current branch are merged into the working file." |
| 2519 | (interactive) | 2519 | (interactive) |
| 2520 | (vc-ensure-vc-buffer) | 2520 | (vc-ensure-vc-buffer) |
| @@ -2524,15 +2524,15 @@ the current branch are merged into the working file." | |||
| 2524 | (vc-checkout file nil "") | 2524 | (vc-checkout file nil "") |
| 2525 | (if (eq (vc-checkout-model file) 'locking) | 2525 | (if (eq (vc-checkout-model file) 'locking) |
| 2526 | (if (eq (vc-state file) 'edited) | 2526 | (if (eq (vc-state file) 'edited) |
| 2527 | (error | 2527 | (error |
| 2528 | (substitute-command-keys | 2528 | (substitute-command-keys |
| 2529 | "File is locked--type \\[vc-revert-buffer] to discard changes")) | 2529 | "File is locked--type \\[vc-revert-buffer] to discard changes")) |
| 2530 | (error | 2530 | (error |
| 2531 | (substitute-command-keys | 2531 | (substitute-command-keys |
| 2532 | "Unexpected file state (%s)--type \\[vc-next-action] to correct") | 2532 | "Unexpected file state (%s)--type \\[vc-next-action] to correct") |
| 2533 | (vc-state file))) | 2533 | (vc-state file))) |
| 2534 | (if (not (vc-find-backend-function (vc-backend file) 'merge-news)) | 2534 | (if (not (vc-find-backend-function (vc-backend file) 'merge-news)) |
| 2535 | (error "Sorry, merging news is not implemented for %s" | 2535 | (error "Sorry, merging news is not implemented for %s" |
| 2536 | (vc-backend file)) | 2536 | (vc-backend file)) |
| 2537 | (vc-call merge-news file) | 2537 | (vc-call merge-news file) |
| 2538 | (vc-resynch-window file t t)))))) | 2538 | (vc-resynch-window file t t)))))) |
diff --git a/lisp/version.el b/lisp/version.el index e5c1017a659..ff90d1fd1e8 100644 --- a/lisp/version.el +++ b/lisp/version.el | |||
| @@ -53,13 +53,13 @@ If optional argument HERE is non-nil, insert string at point. | |||
| 53 | Don't use this function in programs to choose actions according | 53 | Don't use this function in programs to choose actions according |
| 54 | to the system configuration; look at `system-configuration' instead." | 54 | to the system configuration; look at `system-configuration' instead." |
| 55 | (interactive "P") | 55 | (interactive "P") |
| 56 | (let ((version-string | 56 | (let ((version-string |
| 57 | (format (if (not (interactive-p)) | 57 | (format (if (not (interactive-p)) |
| 58 | "GNU Emacs %s (%s%s%s)\n of %s on %s" | 58 | "GNU Emacs %s (%s%s%s)\n of %s on %s" |
| 59 | "GNU Emacs %s (%s%s%s) of %s on %s") | 59 | "GNU Emacs %s (%s%s%s) of %s on %s") |
| 60 | emacs-version | 60 | emacs-version |
| 61 | system-configuration | 61 | system-configuration |
| 62 | (cond ((featurep 'motif) | 62 | (cond ((featurep 'motif) |
| 63 | (concat ", " (substring motif-version-string 4))) | 63 | (concat ", " (substring motif-version-string 4))) |
| 64 | ((featurep 'x-toolkit) ", X toolkit") | 64 | ((featurep 'x-toolkit) ", X toolkit") |
| 65 | (t "")) | 65 | (t "")) |
| @@ -70,7 +70,7 @@ to the system configuration; look at `system-configuration' instead." | |||
| 70 | "") | 70 | "") |
| 71 | (format-time-string "%Y-%m-%d" emacs-build-time) | 71 | (format-time-string "%Y-%m-%d" emacs-build-time) |
| 72 | emacs-build-system))) | 72 | emacs-build-system))) |
| 73 | (if here | 73 | (if here |
| 74 | (insert version-string) | 74 | (insert version-string) |
| 75 | (if (interactive-p) | 75 | (if (interactive-p) |
| 76 | (message "%s" version-string) | 76 | (message "%s" version-string) |
diff --git a/lisp/view.el b/lisp/view.el index 3f328fbaa15..96907371aec 100644 --- a/lisp/view.el +++ b/lisp/view.el | |||
| @@ -700,7 +700,7 @@ Also set the mark at the position where point was." | |||
| 700 | ; (goto-char (point-max)) | 700 | ; (goto-char (point-max)) |
| 701 | ; (beginning-of-line)) | 701 | ; (beginning-of-line)) |
| 702 | ; (view-recenter)) | 702 | ; (view-recenter)) |
| 703 | 703 | ||
| 704 | (defun View-goto-line (&optional line) | 704 | (defun View-goto-line (&optional line) |
| 705 | "Move to first (or prefix LINE) line in View mode. | 705 | "Move to first (or prefix LINE) line in View mode. |
| 706 | Display is centered at LINE. | 706 | Display is centered at LINE. |
| @@ -792,7 +792,7 @@ If LINES is more than a window-full, only the last window-full is shown." | |||
| 792 | See also `View-scroll-page-forward'." | 792 | See also `View-scroll-page-forward'." |
| 793 | (interactive "P") | 793 | (interactive "P") |
| 794 | (view-scroll-lines lines t view-page-size nil)) | 794 | (view-scroll-lines lines t view-page-size nil)) |
| 795 | 795 | ||
| 796 | (defun View-scroll-page-forward-set-page-size (&optional lines) | 796 | (defun View-scroll-page-forward-set-page-size (&optional lines) |
| 797 | "Scroll forward LINES lines in View mode, setting the \"page size\". | 797 | "Scroll forward LINES lines in View mode, setting the \"page size\". |
| 798 | This is the number of lines which \\[View-scroll-page-forward] and | 798 | This is the number of lines which \\[View-scroll-page-forward] and |
| @@ -866,7 +866,7 @@ invocations return to earlier marks." | |||
| 866 | (goto-char (or (mark t) (point-min))) | 866 | (goto-char (or (mark t) (point-min))) |
| 867 | (pop-mark) | 867 | (pop-mark) |
| 868 | (view-recenter)) | 868 | (view-recenter)) |
| 869 | 869 | ||
| 870 | (defun View-search-regexp-forward (n regexp) | 870 | (defun View-search-regexp-forward (n regexp) |
| 871 | "Search forward for first (or prefix Nth) occurrence of REGEXP in View mode. | 871 | "Search forward for first (or prefix Nth) occurrence of REGEXP in View mode. |
| 872 | 872 | ||
diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el index 3d8a9c59647..09c44bfa099 100644 --- a/lisp/vms-patch.el +++ b/lisp/vms-patch.el | |||
| @@ -147,7 +147,7 @@ spawned Emacs and doing things like \"emacs -l myfile.el -f doit\"" | |||
| 147 | (< 32 (setq this-char (aref args end))) | 147 | (< 32 (setq this-char (aref args end))) |
| 148 | (> 127 this-char)) | 148 | (> 127 this-char)) |
| 149 | (setq end (1+ end))) | 149 | (setq end (1+ end))) |
| 150 | (setq command-line-args (append | 150 | (setq command-line-args (append |
| 151 | command-line-args | 151 | command-line-args |
| 152 | (list (substring args beg end)))) | 152 | (list (substring args beg end)))) |
| 153 | (setq beg (1+ end))) | 153 | (setq beg (1+ end))) |
diff --git a/lisp/which-func.el b/lisp/which-func.el index aba47b964e4..1d31b3d304a 100644 --- a/lisp/which-func.el +++ b/lisp/which-func.el | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | 65 | ||
| 66 | ;; Variables for customization | 66 | ;; Variables for customization |
| 67 | ;; --------------------------- | 67 | ;; --------------------------- |
| 68 | ;; | 68 | ;; |
| 69 | (defvar which-func-unknown "???" | 69 | (defvar which-func-unknown "???" |
| 70 | "String to display in the mode line when current function is unknown.") | 70 | "String to display in the mode line when current function is unknown.") |
| 71 | 71 | ||
diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el index b19305e133d..ed904965632 100644 --- a/lisp/wid-browse.el +++ b/lisp/wid-browse.el | |||
| @@ -41,18 +41,18 @@ | |||
| 41 | 41 | ||
| 42 | (defvar widget-browse-mode-map nil | 42 | (defvar widget-browse-mode-map nil |
| 43 | "Keymap for `widget-browse-mode'.") | 43 | "Keymap for `widget-browse-mode'.") |
| 44 | 44 | ||
| 45 | (unless widget-browse-mode-map | 45 | (unless widget-browse-mode-map |
| 46 | (setq widget-browse-mode-map (make-sparse-keymap)) | 46 | (setq widget-browse-mode-map (make-sparse-keymap)) |
| 47 | (set-keymap-parent widget-browse-mode-map widget-keymap) | 47 | (set-keymap-parent widget-browse-mode-map widget-keymap) |
| 48 | (define-key widget-browse-mode-map "q" 'bury-buffer)) | 48 | (define-key widget-browse-mode-map "q" 'bury-buffer)) |
| 49 | 49 | ||
| 50 | (easy-menu-define widget-browse-mode-customize-menu | 50 | (easy-menu-define widget-browse-mode-customize-menu |
| 51 | widget-browse-mode-map | 51 | widget-browse-mode-map |
| 52 | "Menu used in widget browser buffers." | 52 | "Menu used in widget browser buffers." |
| 53 | (customize-menu-create 'widgets)) | 53 | (customize-menu-create 'widgets)) |
| 54 | 54 | ||
| 55 | (easy-menu-define widget-browse-mode-menu | 55 | (easy-menu-define widget-browse-mode-menu |
| 56 | widget-browse-mode-map | 56 | widget-browse-mode-map |
| 57 | "Menu used in widget browser buffers." | 57 | "Menu used in widget browser buffers." |
| 58 | '("Widget" | 58 | '("Widget" |
| @@ -109,7 +109,7 @@ if that value is non-nil." | |||
| 109 | ;;;###autoload | 109 | ;;;###autoload |
| 110 | (defun widget-browse (widget) | 110 | (defun widget-browse (widget) |
| 111 | "Create a widget browser for WIDGET." | 111 | "Create a widget browser for WIDGET." |
| 112 | (interactive (list (completing-read "Widget: " | 112 | (interactive (list (completing-read "Widget: " |
| 113 | obarray | 113 | obarray |
| 114 | (lambda (symbol) | 114 | (lambda (symbol) |
| 115 | (get symbol 'widget-type)) | 115 | (get symbol 'widget-type)) |
| @@ -129,7 +129,7 @@ if that value is non-nil." | |||
| 129 | (kill-buffer (get-buffer-create "*Browse Widget*")) | 129 | (kill-buffer (get-buffer-create "*Browse Widget*")) |
| 130 | (switch-to-buffer (get-buffer-create "*Browse Widget*"))) | 130 | (switch-to-buffer (get-buffer-create "*Browse Widget*"))) |
| 131 | (widget-browse-mode) | 131 | (widget-browse-mode) |
| 132 | 132 | ||
| 133 | ;; Quick way to get out. | 133 | ;; Quick way to get out. |
| 134 | ;; (widget-create 'push-button | 134 | ;; (widget-create 'push-button |
| 135 | ;; :action (lambda (widget &optional event) | 135 | ;; :action (lambda (widget &optional event) |
| @@ -192,7 +192,7 @@ The :value of the widget shuld be the widget to be browsed." | |||
| 192 | :action 'widget-browse-action) | 192 | :action 'widget-browse-action) |
| 193 | 193 | ||
| 194 | (defun widget-browse-action (widget &optional event) | 194 | (defun widget-browse-action (widget &optional event) |
| 195 | ;; Create widget browser for WIDGET's :value. | 195 | ;; Create widget browser for WIDGET's :value. |
| 196 | (widget-browse (widget-get widget :value))) | 196 | (widget-browse (widget-get widget :value))) |
| 197 | 197 | ||
| 198 | (defun widget-browse-value-create (widget) | 198 | (defun widget-browse-value-create (widget) |
| @@ -290,7 +290,7 @@ With arg, turn widget mode on if and only if arg is positive." | |||
| 290 | 290 | ||
| 291 | (add-to-list 'minor-mode-alist '(widget-minor-mode " Widget")) | 291 | (add-to-list 'minor-mode-alist '(widget-minor-mode " Widget")) |
| 292 | 292 | ||
| 293 | (add-to-list 'minor-mode-map-alist | 293 | (add-to-list 'minor-mode-map-alist |
| 294 | (cons 'widget-minor-mode widget-minor-mode-map)) | 294 | (cons 'widget-minor-mode widget-minor-mode-map)) |
| 295 | 295 | ||
| 296 | ;;; The End: | 296 | ;;; The End: |
diff --git a/lisp/widget.el b/lisp/widget.el index ffe8682b616..45b72acb279 100644 --- a/lisp/widget.el +++ b/lisp/widget.el | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | ;; Boston, MA 02111-1307, USA. | 25 | ;; Boston, MA 02111-1307, USA. |
| 26 | 26 | ||
| 27 | ;;; Commentary: | 27 | ;;; Commentary: |
| 28 | ;; | 28 | ;; |
| 29 | ;; The widget library is partially documented in the `widget' Info | 29 | ;; The widget library is partially documented in the `widget' Info |
| 30 | ;; file. | 30 | ;; file. |
| 31 | ;; | 31 | ;; |
| @@ -50,15 +50,15 @@ | |||
| 50 | 50 | ||
| 51 | ;;;(define-widget-keywords :documentation-indent | 51 | ;;;(define-widget-keywords :documentation-indent |
| 52 | ;;; :complete-function :complete :button-overlay | 52 | ;;; :complete-function :complete :button-overlay |
| 53 | ;;; :field-overlay | 53 | ;;; :field-overlay |
| 54 | ;;; :documentation-shown :button-prefix | 54 | ;;; :documentation-shown :button-prefix |
| 55 | ;;; :button-suffix :mouse-down-action :glyph-up :glyph-down :glyph-inactive | 55 | ;;; :button-suffix :mouse-down-action :glyph-up :glyph-down :glyph-inactive |
| 56 | ;;; :prompt-internal :prompt-history :prompt-match | 56 | ;;; :prompt-internal :prompt-history :prompt-match |
| 57 | ;;; :prompt-value :deactivate :active | 57 | ;;; :prompt-value :deactivate :active |
| 58 | ;;; :inactive :activate :sibling-args :delete-button-args | 58 | ;;; :inactive :activate :sibling-args :delete-button-args |
| 59 | ;;; :insert-button-args :append-button-args :button-args | 59 | ;;; :insert-button-args :append-button-args :button-args |
| 60 | ;;; :tag-glyph :off-glyph :on-glyph :valid-regexp | 60 | ;;; :tag-glyph :off-glyph :on-glyph :valid-regexp |
| 61 | ;;; :secret :sample-face :sample-face-get :case-fold | 61 | ;;; :secret :sample-face :sample-face-get :case-fold |
| 62 | ;;; :create :convert-widget :format :value-create :offset :extra-offset | 62 | ;;; :create :convert-widget :format :value-create :offset :extra-offset |
| 63 | ;;; :tag :doc :from :to :args :value :action | 63 | ;;; :tag :doc :from :to :args :value :action |
| 64 | ;;; :value-set :value-delete :match :parent :delete :menu-tag-get | 64 | ;;; :value-set :value-delete :match :parent :delete :menu-tag-get |
| @@ -68,7 +68,7 @@ | |||
| 68 | ;;; :indent :size :value-to-external :validate :error :directory | 68 | ;;; :indent :size :value-to-external :validate :error :directory |
| 69 | ;;; :must-match :type-error :value-inline :inline :match-inline :greedy | 69 | ;;; :must-match :type-error :value-inline :inline :match-inline :greedy |
| 70 | ;;; :button-face-get :button-face :value-face :keymap :entry-from | 70 | ;;; :button-face-get :button-face :value-face :keymap :entry-from |
| 71 | ;;; :entry-to :help-echo :documentation-property :tab-order) | 71 | ;;; :entry-to :help-echo :documentation-property :tab-order) |
| 72 | 72 | ||
| 73 | (defun define-widget (name class doc &rest args) | 73 | (defun define-widget (name class doc &rest args) |
| 74 | "Define a new widget type named NAME from CLASS. | 74 | "Define a new widget type named NAME from CLASS. |
diff --git a/lisp/window.el b/lisp/window.el index bacd9161ea5..3f533940a14 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -525,7 +525,7 @@ Return non-nil if the window was shrunk." | |||
| 525 | (not (eq frame (window-frame mini-window))) | 525 | (not (eq frame (window-frame mini-window))) |
| 526 | (< (nth 3 edges) | 526 | (< (nth 3 edges) |
| 527 | (nth 1 (window-edges mini-window))) | 527 | (nth 1 (window-edges mini-window))) |
| 528 | (> (nth 1 edges) | 528 | (> (nth 1 edges) |
| 529 | (frame-parameter frame 'menu-bar-lines)))))) | 529 | (frame-parameter frame 'menu-bar-lines)))))) |
| 530 | (fit-window-to-buffer window (window-height window))))) | 530 | (fit-window-to-buffer window (window-height window))))) |
| 531 | 531 | ||
diff --git a/lisp/winner.el b/lisp/winner.el index 68c1df9f2b5..7841ad0d1db 100644 --- a/lisp/winner.el +++ b/lisp/winner.el | |||
| @@ -128,11 +128,11 @@ You may want to include buffer names such as *Help*, *Apropos*, | |||
| 128 | while (= a b) | 128 | while (= a b) |
| 129 | finally return (< a b))))) | 129 | finally return (< a b))))) |
| 130 | 130 | ||
| 131 | (defun winner-win-data () | 131 | (defun winner-win-data () |
| 132 | ;; Essential properties of the windows in the selected frame. | 132 | ;; Essential properties of the windows in the selected frame. |
| 133 | (loop for win in (winner-sorted-window-list) | 133 | (loop for win in (winner-sorted-window-list) |
| 134 | collect (cons (winner-edges win) (window-buffer win)))) | 134 | collect (cons (winner-edges win) (window-buffer win)))) |
| 135 | 135 | ||
| 136 | ;; This variable is updated with the current window configuration | 136 | ;; This variable is updated with the current window configuration |
| 137 | ;; every time it changes. | 137 | ;; every time it changes. |
| 138 | (defvar winner-currents nil) | 138 | (defvar winner-currents nil) |
| @@ -262,7 +262,7 @@ You may want to include buffer names such as *Help*, *Apropos*, | |||
| 262 | ((window-live-p chosen) (select-window chosen)) | 262 | ((window-live-p chosen) (select-window chosen)) |
| 263 | ((window-minibuffer-p (selected-window)) | 263 | ((window-minibuffer-p (selected-window)) |
| 264 | (other-window 1))) | 264 | (other-window 1))) |
| 265 | (when (/= minisize (window-height miniwin)) | 265 | (when (/= minisize (window-height miniwin)) |
| 266 | (letf (((selected-window) miniwin) ) | 266 | (letf (((selected-window) miniwin) ) |
| 267 | (setf (window-height) minisize))))) | 267 | (setf (window-height) minisize))))) |
| 268 | 268 | ||
| @@ -279,7 +279,7 @@ You may want to include buffer names such as *Help*, *Apropos*, | |||
| 279 | (letf (((current-buffer))) | 279 | (letf (((current-buffer))) |
| 280 | (loop with alist | 280 | (loop with alist |
| 281 | for win in (winner-window-list) | 281 | for win in (winner-window-list) |
| 282 | for entry = | 282 | for entry = |
| 283 | (or (assq (window-buffer win) alist) | 283 | (or (assq (window-buffer win) alist) |
| 284 | (car (push (list (set-buffer (window-buffer win)) | 284 | (car (push (list (set-buffer (window-buffer win)) |
| 285 | (cons (mark t) (winner-active-region))) | 285 | (cons (mark t) (winner-active-region))) |
| @@ -335,7 +335,7 @@ You may want to include buffer names such as *Help*, *Apropos*, | |||
| 335 | 335 | ||
| 336 | ;; Restore marks | 336 | ;; Restore marks |
| 337 | (letf (((current-buffer))) | 337 | (letf (((current-buffer))) |
| 338 | (loop for buf in buffers | 338 | (loop for buf in buffers |
| 339 | for entry = (cadr (assq buf winner-point-alist)) | 339 | for entry = (cadr (assq buf winner-point-alist)) |
| 340 | do (progn (set-buffer buf) | 340 | do (progn (set-buffer buf) |
| 341 | (set-mark (car entry)) | 341 | (set-mark (car entry)) |
| @@ -384,7 +384,7 @@ With arg, turn Winner mode on if and only if arg is positive." | |||
| 384 | (not winner-mode)))) | 384 | (not winner-mode)))) |
| 385 | (cond | 385 | (cond |
| 386 | ;; Turn mode on | 386 | ;; Turn mode on |
| 387 | (on-p | 387 | (on-p |
| 388 | (setq winner-mode t) | 388 | (setq winner-mode t) |
| 389 | (cond | 389 | (cond |
| 390 | ((winner-hook-installed-p) | 390 | ((winner-hook-installed-p) |
| @@ -435,16 +435,16 @@ In other words, \"undo\" changes in window configuration." | |||
| 435 | (message "Winner undo (%d / %d)" | 435 | (message "Winner undo (%d / %d)" |
| 436 | winner-undo-counter | 436 | winner-undo-counter |
| 437 | (1- (ring-length winner-pending-undo-ring))))))) | 437 | (1- (ring-length winner-pending-undo-ring))))))) |
| 438 | 438 | ||
| 439 | 439 | ||
| 440 | 440 | ||
| 441 | (defun winner-undo-this () ; The heart of winner undo. | 441 | (defun winner-undo-this () ; The heart of winner undo. |
| 442 | (loop | 442 | (loop |
| 443 | (cond | 443 | (cond |
| 444 | ((>= winner-undo-counter (ring-length winner-pending-undo-ring)) | 444 | ((>= winner-undo-counter (ring-length winner-pending-undo-ring)) |
| 445 | (message "No further window configuration undo information") | 445 | (message "No further window configuration undo information") |
| 446 | (return nil)) | 446 | (return nil)) |
| 447 | 447 | ||
| 448 | ((and ; If possible configuration | 448 | ((and ; If possible configuration |
| 449 | (winner-set (ring-ref winner-pending-undo-ring | 449 | (winner-set (ring-ref winner-pending-undo-ring |
| 450 | winner-undo-counter)) | 450 | winner-undo-counter)) |
| @@ -455,7 +455,7 @@ In other words, \"undo\" changes in window configuration." | |||
| 455 | (return t)) ; .. then everything is fine. | 455 | (return t)) ; .. then everything is fine. |
| 456 | (t ;; Otherwise, discharge it (and try the next one). | 456 | (t ;; Otherwise, discharge it (and try the next one). |
| 457 | (ring-remove winner-pending-undo-ring winner-undo-counter))))) | 457 | (ring-remove winner-pending-undo-ring winner-undo-counter))))) |
| 458 | 458 | ||
| 459 | 459 | ||
| 460 | (defun winner-redo () ; If you change your mind. | 460 | (defun winner-redo () ; If you change your mind. |
| 461 | "Restore a more recent window configuration saved by Winner mode." | 461 | "Restore a more recent window configuration saved by Winner mode." |
diff --git a/lisp/xscheme.el b/lisp/xscheme.el index 2eddecfb0d2..98803e510ae 100644 --- a/lisp/xscheme.el +++ b/lisp/xscheme.el | |||
| @@ -215,7 +215,7 @@ With argument, asks for a command line." | |||
| 215 | (kill-local-variable 'xscheme-buffer-name) | 215 | (kill-local-variable 'xscheme-buffer-name) |
| 216 | (kill-local-variable 'xscheme-process-name) | 216 | (kill-local-variable 'xscheme-process-name) |
| 217 | (kill-local-variable 'xscheme-runlight)) | 217 | (kill-local-variable 'xscheme-runlight)) |
| 218 | 218 | ||
| 219 | (defun verify-xscheme-buffer (buffer-name localp) | 219 | (defun verify-xscheme-buffer (buffer-name localp) |
| 220 | (if (and localp (xscheme-process-buffer-current-p)) | 220 | (if (and localp (xscheme-process-buffer-current-p)) |
| 221 | (error "Cannot change the interaction buffer of an interaction buffer")) | 221 | (error "Cannot change the interaction buffer of an interaction buffer")) |
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el index 179294cc88e..08e1d39a430 100644 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | (vector down-where down-command) | 65 | (vector down-where down-command) |
| 66 | (vector down-command)))) | 66 | (vector down-command)))) |
| 67 | (is-click (string-match "^mouse" (symbol-name (car down))))) | 67 | (is-click (string-match "^mouse" (symbol-name (car down))))) |
| 68 | 68 | ||
| 69 | (unless is-click | 69 | (unless is-click |
| 70 | (unless (and (eq (read-char) ?\e) | 70 | (unless (and (eq (read-char) ?\e) |
| 71 | (eq (read-char) ?\[) | 71 | (eq (read-char) ?\[) |
| @@ -140,7 +140,7 @@ | |||
| 140 | (max 0 (1- (window-hscroll))))) | 140 | (max 0 (1- (window-hscroll))))) |
| 141 | (point)) | 141 | (point)) |
| 142 | where)) | 142 | where)) |
| 143 | (mouse (intern | 143 | (mouse (intern |
| 144 | ;; For buttons > 3, the release-event looks | 144 | ;; For buttons > 3, the release-event looks |
| 145 | ;; differently (see xc/programs/xterm/button.c, | 145 | ;; differently (see xc/programs/xterm/button.c, |
| 146 | ;; function EditorButton), and there seems to come in | 146 | ;; function EditorButton), and there seems to come in |