diff options
| -rw-r--r-- | lisp/ChangeLog | 162 | ||||
| -rw-r--r-- | lisp/ediff-hook.el | 62 |
2 files changed, 116 insertions, 108 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a06ae5eac0c..4c2e279b438 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu> + + * ediff-hooks.el: Put back the autoloads. + 2002-04-25 Colin Walters <walters@verbum.org> * ibuffer.el (define column process): Use `ibuffer-aif'. @@ -273,7 +277,7 @@ when finding the end. Take more care in analyzing the results of intangibility after line-move-to-column. -2002-04-22 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-22 Pavel Janík <Pavel@Janik.cz> * international/mule-diag.el (list-input-methods-1): Doc fix (LEIM is now part of the standard distribution). @@ -1265,7 +1269,7 @@ * term.el (term-emulate-terminal): Fix last change. -2002-04-16 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-16 Pavel Janík <Pavel@Janik.cz> * bindings.el (mode-line-mode-menu): Update names to reflect latest changes. @@ -1341,7 +1345,7 @@ (exchange-point-and-mark): Temporarily enable transient-mark-mode if prefix arg. -2002-04-14 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-14 Pavel Janík <Pavel@Janik.cz> * speedbar.el (speedbar-tag-hierarchy-method) (speedbar-toggle-updates, speedbar-toggle-images): Doc fixes. @@ -1351,7 +1355,7 @@ * textmodes/sgml-mode.el (sgml-parse-tag-backward): Fix to work at beginning of buffer. -2002-04-14 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-14 Pavel Janík <Pavel@Janik.cz> * speedbar.el (speedbar-generic-item-info) (speedbar-sort-tags): Doc fix. @@ -1380,7 +1384,7 @@ (gamegrid-add-score): Just dispatch on `system-type' to one of the previous two functions. -2002-04-13 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-13 Pavel Janík <Pavel@Janik.cz> * iswitchb.el: Update commentary to include new function iswitchb-exclude-nonmatching. @@ -1445,7 +1449,7 @@ (fill-region-as-paragraph): Compare to `to' rather than eobp. (fill-paragraph): Don't rebind fill-paragraph-function. -2002-04-11 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-11 Pavel Janík <Pavel@Janik.cz> * menu-bar.el (menu-bar-adv-search-menu): Add incremental search. @@ -1563,7 +1567,7 @@ Use sgml-parse-tag-backward to find start point. (sgml-looking-back-at): Doc fix. -2002-04-09 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-09 Pavel Janík <Pavel@Janik.cz> * isearch.el (isearch-message-prefix): Use minibuffer-prompt face for prompt. @@ -1612,7 +1616,7 @@ * vc-cvs.el (vc-cvs-valid-version-number-p): New function. (vc-cvs-checkin): Use it. -2002-04-08 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-08 Pavel Janík <Pavel@Janik.cz> * files.el (display-time-string): Fix last change. @@ -1627,7 +1631,7 @@ default-process-coding-system. (coding-system-change-text-conversion): Fix case where CODING is nil. -2002-04-07 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-07 Pavel Janík <Pavel@Janik.cz> * subr.el (play-sound): Move here from simple.el. @@ -1654,7 +1658,7 @@ * textmodes/xml-lite.el: Remove. -2002-04-05 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-05 Pavel Janík <Pavel@Janik.cz> * simple.el (play-sound): New function (uses play-sound-internal). @@ -1678,7 +1682,7 @@ * textmodes/sgml-mode.el: Add missing require. (sgml-lexical-context): Fix up CDATA detection for boundary cases. -2002-04-03 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> +2002-04-03 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> * pcvs.el (cvs-mode-previous-line, cvs-mode-next-line): Move to spot indicated by text property `cvs-goal-column', if present. @@ -1746,7 +1750,7 @@ (sgml-parse-tag-backward): Extend support for CDATA to include conditional sections. -2002-04-03 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-03 Pavel Janík <Pavel@Janik.cz> * cus-start.el: Rename `autoselect-window' to `mouse-autoselect-window'. @@ -1820,7 +1824,7 @@ (xml-lite-parse-tag-backward): Simplify parsing by assuming we always start within text. Make use of sgml-unclosed-tag-p. -2002-04-01 Ville Skytt,Ad(B <ville.skytta@xemacs.org> +2002-04-01 Ville Skyttä <ville.skytta@xemacs.org> * tcl.el (tcl-imenu-generic-expression): New value. (tcl-imenu-create-index-function): Function deleted. @@ -1830,7 +1834,7 @@ (inferior-tcl-mode): Doc fix. Change not legally significant. -2002-04-01 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-04-01 Pavel Janík <Pavel@Janik.cz> * cus-start.el: Rename `x-autoselect-window' to `autoselect-window'. @@ -2031,7 +2035,7 @@ for comments. (xml-lite-in-string-p): Simplify. -2002-03-27 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-03-27 Pavel Janík <Pavel@Janik.cz> * allout.el (outline-layout): Doc fix. @@ -2099,7 +2103,7 @@ * subr.el (substring-no-properties): Function deleted (now in C). -2002-03-25 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-03-25 Pavel Janík <Pavel@Janik.cz> * mwheel.el (mouse-wheel-mode): Use global-set-key and global-unset-key. @@ -2140,7 +2144,7 @@ fore- and background colors of the faces we create, since facemenu doesn't. -2002-03-24 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-03-24 Pavel Janík <Pavel@Janik.cz> * mwheel.el (mouse-wheel-mode): Use the result of current-global-map instead of the variable `global-map'. @@ -2195,7 +2199,7 @@ * mail/emacsbug.el (report-emacs-bug-hook): Remove submitter directions as the last action. -2002-03-21 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-03-21 Pavel Janík <Pavel@Janik.cz> * startup.el (fancy-splash-tail, normal-splash-screen): Update copyright. @@ -2384,7 +2388,7 @@ <top-level>: Remove the setup for all known codepages: it seems to cause crashes in the CCL driver. -2002-03-16 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-03-16 Pavel Janík <Pavel@Janik.cz> * textmodes/bibtex.el (bibtex-sort-ignore-string-entries) (bibtex-entry-field-alist): Doc fix. @@ -2402,7 +2406,7 @@ * files.el (load-completion): New function. (load-library): Use it. -2002-03-15 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-03-15 Pavel Janík <Pavel@Janik.cz> * calendar/cal-french.el (calendar-goto-french-date): Fix prompt to match the actual code. @@ -2545,7 +2549,7 @@ * comint.el: Remove documentation on setting up pcomplete. -2002-03-11 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-03-11 Pavel Janík <Pavel@Janik.cz> * font-lock.el (java-font-lock-extra-types): Add "URL" as separate item. Doc fix. @@ -2665,7 +2669,7 @@ (hif-conditional): New function to evaluate a conditional expression. -2002-03-06 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-03-06 Pavel Janík <Pavel@Janik.cz> * language/czech.el ("Czech"): Fix the documentation. @@ -2728,7 +2732,7 @@ (mode-line-inactive, header-line): Move the `t' section to the beginning so the `:inherit' setting can be shared. -2002-03-04 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-03-04 Pavel Janík <Pavel@Janik.cz> * net/snmp-mode.el: Require tempo when compiling to prevent warnings. Update copyright notice. @@ -2849,7 +2853,7 @@ * font-lock.el (java-font-lock-extra-types): Match java.net.URL, etc. -2002-02-28 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-02-28 Pavel Janík <Pavel@Janik.cz> * hexl.el (hexl-options): Doc fix. Update Commentary section. @@ -3129,7 +3133,7 @@ * progmodes/tcl.el (tcl-do-fill-paragraph): Find and fill on more natural paragraph boundaries. Don't fail at beginning of buffer. -2002-02-20 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-02-20 Pavel Janík <Pavel@Janik.cz> * tar-mode.el (tar-next-line, tar-previous-line): Add doc string, call the argument "arg" to match plain next-line and @@ -3193,7 +3197,7 @@ * mail/uce.el (uce-reply-to-uce): Fix incorrect behavior when invoked from Rmail with full headers displayed. -2002-02-17 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> +2002-02-17 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> * emacs-lisp/lisp.el (mark-defun): Don't leave multiple marks when repeated. @@ -3209,7 +3213,7 @@ * textmodes/flyspell.el (flyspell): Add to ispell group. -2002-02-17 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> +2002-02-17 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> * emacs-lisp/lisp.el (mark-sexp): Don't leave multiple marks when repeated. @@ -3233,7 +3237,7 @@ * cus-start.el: Add automatic-hscroll-margin and automatic-hscroll-step. -2002-02-16 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-02-16 Pavel Janík <Pavel@Janik.cz> * cus-start.el (x-autoselect-window): Allow customization. @@ -3330,7 +3334,7 @@ * menu-bar.el (menu-bar-tools-menu): Add an item for Calculator. -2002-02-15 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> +2002-02-15 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> * simple.el (mark-word): Mark more if repeated. * textmodes/paragraphs.el (mark-paragraph): Ditto. @@ -3453,7 +3457,7 @@ * cus-start.el: Don't warn about "x-*" symbols when building a non-GUI version. -2002-02-11 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-02-11 Pavel Janík <Pavel@Janik.cz> * strokes.el (strokes-do-stroke, strokes-do-complex-stroke): Doc fix. @@ -3478,7 +3482,7 @@ (dump-charsets, dump-codings): Deleted (obsolete). From Dave Love <fx@gnu.org>. -2002-02-10 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-02-10 Pavel Janík <Pavel@Janik.cz> * menu-bar.el (menu-bar-showhide-menu): Rename functions for toggling. @@ -3501,7 +3505,7 @@ * ediff.el: Typo in comment. -2002-02-09 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-02-09 Pavel Janík <Pavel@Janik.cz> * menu-bar.el (menu-bar-options-save): Take care of line-number-mode and column-number-mode variables. @@ -3578,7 +3582,7 @@ * subr.el (global-set-key, local-set-key): Accept a symbol for the KEY argument (like define-key). -2002-02-06 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-02-06 Pavel Janík <Pavel@Janik.cz> * textmodes/flyspell.el (flyspell-insert-function): Doc fix. @@ -3659,7 +3663,7 @@ * cus-edit.el (customize-mark-to-save): New function. * menu-bar.el (menu-bar-options-save): Rewrote. -2002-02-05 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-02-05 Pavel Janík <Pavel@Janik.cz> * cus-start.el (x-use-underline-position-properties): Allow customization. @@ -3692,11 +3696,11 @@ * window.el (save-selected-window): Move macro before first use. (balance-windows): Fix misplaced parenthesis. -2002-02-03 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-02-03 Pavel Janík <Pavel@Janik.cz> * calculator.el (calculator-displayers): Doc fixes. -2002-02-03 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-02-03 Pavel Janík <Pavel@Janik.cz> * menu-bar.el (menu-bar-help-menu): Use different text for tool-tip. (menu-bar-options-save): Save also the value of `display-time-mode'. @@ -3735,7 +3739,7 @@ looking for X-Coding-System header, and restore the pruned state before returning. -2002-02-02 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-02-02 Pavel Janík <Pavel@Janik.cz> * cus-edit.el (customize-save-variable): Fix typo in prompt. @@ -3824,7 +3828,7 @@ * emulation/pc-select.el (pc-select-save-and-set-mode): Properly use MODE-VAR. -2002-01-29 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-29 Pavel Janík <Pavel@Janik.cz> * menu-bar.el (menu-bar-help-menu): Change menu-item "Show Emacs Version" to "About Emacs". @@ -3841,7 +3845,7 @@ * calendar/calendar.el (generate-calendar-month): Doc fix. -2002-01-27 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-27 Pavel Janík <Pavel@Janik.cz> * time.el (display-time-mail-directory): New option. (display-time-mail-function): Update doc-string. @@ -4056,7 +4060,7 @@ with `byte-compile-dynamic'. (ibuffer-default-directory, toplevel): Doc files. -2002-01-20 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-20 Pavel Janík <Pavel@Janik.cz> * tempo.el (tempo-define-template): Doc fix. @@ -4073,7 +4077,7 @@ * term/w32-win.el (mouse-set-font): Use w32-list-proportional-fonts. -2002-01-19 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-19 Pavel Janík <Pavel@Janik.cz> * language/tibet-util.el (tibetan-decompose-region) (tibetan-decompose-string): Fix typo in docstring. @@ -4165,7 +4169,7 @@ * mail/feedmail.el (feedmail): Fix :link spec. -2002-01-16 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-16 Pavel Janík <Pavel@Janik.cz> * net/ldap.el (ldap-ldapsearch-prog): Default to OpenLDAP version 2 ldapsearch. @@ -4283,7 +4287,7 @@ (comint-send-input): New arg NO-NEWLINE. (comint-send-eof): Call comint-send-eof with NO-NEWLINE. -2002-01-12 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-12 Pavel Janík <Pavel@Janik.cz> * textmodes/flyspell.el (flyspell-check-pre-word-p): Prevent delaying when executing keyboard macros. @@ -4368,7 +4372,7 @@ * textmodes/flyspell.el (flyspell-mode-line-string): Fix custom type. -2002-01-08 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-08 Pavel Janík <Pavel@Janik.cz> * progmodes/ada-mode.el (ada-initialize-properties, ada-mode): Do not use make-local-hook. @@ -4384,7 +4388,7 @@ * ediff-hook.el: Add an autoload cookie. -2002-01-08 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-08 Pavel Janík <Pavel@Janik.cz> * net/eudcb-ph.el, net/ldap.el: New maintainer. New e-mail address of the author. @@ -4496,7 +4500,7 @@ * help-fns.el (describe-variable, describe-function): Do save-excursion. -2002-01-06 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-06 Pavel Janík <Pavel@Janik.cz> * net/ldap.el (ldap-search-internal): Skip error message from ldapsearch. Allow listing attribute names only. Do not open @@ -4520,7 +4524,7 @@ * net/eudcb-ldap.el (eudc-attribute-display-method-alist): Use proper attribute name labeledUri instead of deprecated labeledUrl. -2002-01-05 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-05 Pavel Janík <Pavel@Janik.cz> * net/eudc-hotlist.el (eudc-edit-hotlist): Avoid error when editing an empty hotlist. @@ -4582,7 +4586,7 @@ * mail/sendmail.el (mail-recover-1, mail-recover): Doc fix. -2002-01-04 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-04 Pavel Janík <Pavel@Janik.cz> * net/ldap.el (ldap-host-parameters-alist): Remove duplicated entry. @@ -4613,7 +4617,7 @@ does not exist, call mail-recover-1 to allow recovery from past auto-saved drafts. -2002-01-03 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-03 Pavel Janík <Pavel@Janik.cz> * time.el (display-time-load-average-threshold): Fix defcustom (add type and group). @@ -4732,7 +4736,7 @@ * bindings.el (function-key-map): Don't bind shifted keypad numeric keys. -2002-01-02 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2002-01-02 Pavel Janík <Pavel@Janik.cz> * enriched.el (enriched-handle-display-prop): Remove unused variables. @@ -4769,7 +4773,7 @@ * cus-edit.el (custom-face-edit-fix-value): New function. (custom-face-edit): Use it, to convert :italic and :bold to new forms. -2001-12-30 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-12-30 Pavel Janík <Pavel@Janik.cz> * progmodes/octave-mod.el (octave-abbrev-table): * progmodes/idlwave.el (idlwave-mode-abbrev-table): @@ -4899,7 +4903,7 @@ * international/fontset.el: Don't require ind-util when compiling. -2001-12-25 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-12-25 Pavel Janík <Pavel@Janik.cz> * emulation/tpu-edt.el (tpu-reset-screen-size): Use set-frame-height and set-frame-width instead of set-screen-height @@ -4987,7 +4991,7 @@ * play/yow.el (yow): Use an arg to distinguish interactive calls, not interactive-p. -2001-12-22 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-12-22 Pavel Janík <Pavel@Janik.cz> * emacs-lisp/elint.el (elint-unknown-builtin-args): Remove mocklisp entries. @@ -5014,7 +5018,7 @@ * textmodes/refill.el (refill-mode): Don't barf when redundantly turning refill-mode off. -2001-12-22 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-12-22 Pavel Janík <Pavel@Janik.cz> * time.el (display-time-load-average-threshold): New variable. (display-time-update): Use it. @@ -5157,7 +5161,7 @@ print-coding-system-briefly): Make printed output have a similar format as describe-character-set. -2001-12-20 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-12-20 Pavel Janík <Pavel@Janik.cz> * play/blackbox.el (bb-member): Remove, use member instead. (bb-delete): Remove, use delete instead. @@ -5191,7 +5195,7 @@ * international/fontset.el: Require `ind-util' when compiling. -2001-12-18 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-12-18 Pavel Janík <Pavel@Janik.cz> * language/ethio-util.el (ethio-modify-vowel): Use char-to-string instead of decompose-composite-char. @@ -5409,7 +5413,7 @@ * newcomment.el (comment-indent): Jump to the middle of empty comments. -2001-12-14 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-12-14 Pavel Janík <Pavel@Janik.cz> * select.el (xselect-convert-to-class, xselect-convert-to-name): Document. @@ -5457,7 +5461,7 @@ * international/mule.el (set-auto-coding): Don't search for "unibyte:" or "coding:" if set-auto-mode-1 returns nil. -2001-12-13 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-12-13 Pavel Janík <Pavel@Janik.cz> * mail/mailabbrev.el (mail-abbrevs-setup): Do not use make-local-hook. @@ -5513,7 +5517,7 @@ * language/european.el: Remove autoload cookies. Fix registration of diacritic composition function. -2001-12-11 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-12-11 Pavel Janík <Pavel@Janik.cz> * calendar/todo-mode.el: Require time-stamp. @@ -5570,7 +5574,7 @@ Use `select-frame-set-input-focus'--needed when window manager uses "click to focus" policy. -2001-12-09 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-12-09 Pavel Janík <Pavel@Janik.cz> * COPYING: Moved back. @@ -5719,7 +5723,7 @@ * textmodes/picture.el (picture-mode-map): Don't use defconst for a variable. -2001-12-02 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-12-02 Pavel Janík <Pavel@Janik.cz> * textmodes/reftex-index.el (reftex-index-mode): Remove make-local-hook. @@ -5784,12 +5788,12 @@ * man.el (Man-build-section-alist): Remove last Man-match-substring. -2001-11-30 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> +2001-11-30 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> * textmodes/paragraphs.el (mark-paragraph): Clarify doc. Clarify error message. -2001-11-29 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> +2001-11-29 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> * textmodes/paragraphs.el (mark-paragraph): Allow prefix arg. @@ -5843,7 +5847,7 @@ (Info-index): Use it. Add completion to the interactive spec. (Info-menu-update): Simplify call to `Info-complete-menu-item'. -2001-11-29 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-11-29 Pavel Janík <Pavel@Janik.cz> * COPYING: Removed. @@ -5860,7 +5864,7 @@ (register-char-codings): Use it to cope with generic chars in safe-chars. -2001-11-29 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-11-29 Pavel Janík <Pavel@Janik.cz> * play/blackbox.el (blackbox-mode, blackbox): Doc fix. @@ -6004,7 +6008,7 @@ * frame.el (show-trailing-whitespace): Remove :set argument (the value was essentially identical to the defalt). -2001-11-26 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-11-26 Pavel Janík <Pavel@Janik.cz> * hexl.el (hexl-mode, hexl-follow-ascii): Remove make-local-hook. @@ -6068,7 +6072,7 @@ * help-funs.el (describe-syntax): Put (interactive) after doc string. -2001-11-26 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-11-26 Pavel Janík <Pavel@Janik.cz> * international/quail.el (quail-help): Require help-mode in top-level instead. @@ -6139,12 +6143,12 @@ * language/devan-util.el: Comment out parts of the file which apparently are garbled. -2001-11-25 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-11-25 Pavel Janík <Pavel@Janik.cz> * mail/smtpmail.el (smtpmail-deduce-address-list): Don't use insert-string. -2001-11-25 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-11-25 Pavel Janík <Pavel@Janik.cz> * play/snake.el (snake-mode): Remove make-local-hook. @@ -6271,7 +6275,7 @@ * international/encoded-kb.el: Don't alter minor-map-alist. -2001-11-20 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> +2001-11-20 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> * files.el (auto-save-file-name-transforms): Put remote files in temporary-file-directory rather than /tmp. @@ -6629,7 +6633,7 @@ Don't recognize a "telephone number" at the beginning of the name. (mail-extr-leading-garbage): Match non-word characters only. -2001-11-16 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-11-16 Pavel Janík <Pavel@Janik.cz> * startup.el (command-line-processed): Doc fix. @@ -6657,7 +6661,7 @@ (multiple-value-apply, nth-value): Use defsubst rather than defalias to get better doc strings. -2001-11-15 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-11-15 Pavel Janík <Pavel@Janik.cz> * derived.el: Fix autoload cookie. @@ -6852,7 +6856,7 @@ (log-view-current-tag): Take an optional `where' arg. (log-view-diff): New user command. -2001-11-12 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-11-12 Pavel Janík <Pavel@Janik.cz> * progmodes/cpp.el (cpp-choose-face): Fix typo. @@ -6892,7 +6896,7 @@ * calc/calc-ext.el (calc-init-extensions): Update autoload names to match files renamed on initial calc import. -2001-11-12 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-11-12 Pavel Janík <Pavel@Janik.cz> * textmodes/flyspell.el (flyspell-default-dictionary): Fix previous change. @@ -6935,7 +6939,7 @@ 2001-11-11 Colin Walters <walters@verbum.org> The following changes are based on patches from - Eli Zaretskii <eliz@is.elta.co.il>, Kai Gro,A_(Bjohann + Eli Zaretskii <eliz@is.elta.co.il>, Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>, and others. * calc/calc.el (toplevel): Require calc-macs. @@ -7004,7 +7008,7 @@ (radio-button-choice): Ditto. (editable-list): Ditto. -2001-11-09 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-11-09 Pavel Janík <Pavel@Janik.cz> * play/gomoku.el: Move definitions of constants to the beginning of file, before their use. @@ -7280,7 +7284,7 @@ (debugger-setup-buffer): Call it. (debugger-mode-map): Bind RET and mouse-2. -2001-10-31 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-10-31 Pavel Janík <Pavel@Janik.cz> * startup.el: Document command line option --no-window-system instead of --no-windows. @@ -7423,7 +7427,7 @@ Report numbers of files skipped and failed too. (byte-compile-file): Return 'no-byte-compile for skipped files. -2001-10-29 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> +2001-10-29 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> * log-view.el (log-view-mode-map): Bind `M-n' and `M-p', not `M n' and `M p'. @@ -7773,7 +7777,7 @@ * progmodes/compile.el (compilation-set-window-height): Select old window only if it's still live. -2001-10-22 Pavel Jan,Am(Bk <Pavel@Janik.cz> +2001-10-22 Pavel Janík <Pavel@Janik.cz> * help-mode.el (help-buffer): Remove debugging code. From Stefan Monnier <monnier@cs.yale.edu>. diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el index 3bf006d9c1d..23baeb49d7d 100644 --- a/lisp/ediff-hook.el +++ b/lisp/ediff-hook.el @@ -44,41 +44,45 @@ ;; end pacifier ;; allow menus to be set up without ediff-wind.el being loaded +;;;###autoload (defvar ediff-window-setup-function) -;; This is used to avoid compilation warnings. When emacs/xemacs forms can -;; generate compile time warnings, we use this macro. -;; In this case, the macro will expand into the form that is appropriate to the -;; compiler at hand. -;; Suggested by rms. +;; This macro is used to avoid compilation warnings. +;; The macro will expand into the form that is appropriate to the +;; compiler at hand (emacs or xemacs). +;; The autoload, below, is useless in Emacs because ediff-hook.el +;; is dumped with emacs, but it is needed in XEmacs +;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (string-match "XEmacs" emacs-version) xemacs-form emacs-form)) -;; Note we wrap this in a progn so that we pick up the whole def -;; for auto-autoload. That way we do not load ediff-hook.el when defining -;; the menus. -(progn - (ediff-cond-compile-for-xemacs-or-emacs - ;; xemacs form - (defun ediff-xemacs-init-menus () - (if (featurep 'menubar) - (progn - (add-submenu - '("Tools") ediff-menu "OO-Browser...") - (add-submenu - '("Tools") ediff-merge-menu "OO-Browser...") - (add-submenu - '("Tools") epatch-menu "OO-Browser...") - (add-submenu - '("Tools") ediff-misc-menu "OO-Browser...") - (add-menu-button - '("Tools") "-------" "OO-Browser...") - ))) - nil ; emacs form - )) - - +;; This autoload is useless in Emacs because ediff-hook.el is dumped with +;; emacs, but it is needed in XEmacs +;;;###autoload +(ediff-cond-compile-for-xemacs-or-emacs + ;; xemacs form + (defun ediff-xemacs-init-menus () + (if (featurep 'menubar) + (progn + (add-submenu + '("Tools") ediff-menu "OO-Browser...") + (add-submenu + '("Tools") ediff-merge-menu "OO-Browser...") + (add-submenu + '("Tools") epatch-menu "OO-Browser...") + (add-submenu + '("Tools") ediff-misc-menu "OO-Browser...") + (add-menu-button + '("Tools") "-------" "OO-Browser...") + ))) + nil ; emacs form + ) + + +;; This autoload is useless in Emacs because ediff-hook.el is dumped with +;; emacs, but it is needed in XEmacs +;;;###autoload (ediff-cond-compile-for-xemacs-or-emacs (progn (defvar ediff-menu |