summaryrefslogtreecommitdiff
path: root/lisp/ediff-hook.el
Commit message (Collapse)AuthorAgeFilesLines
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-263/+0
| | | | | | | | | | | | * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el, * ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el, * ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el, * ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el, * pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el, * smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el, * vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el, * vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el: Move files to the "vc" subdirectory.
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
|
* * subr.el (menu-bar-separator): New defconst.Dan Nicolaescu2009-11-111-7/+7
| | | | | | | | | | | | | * replace.el (occur-mode-map): * menu-bar.el (menu-bar-file-menu, menu-bar-search-menu) (menu-bar-edit-menu, menu-bar-goto-menu, menu-bar-edit-menu) (menu-bar-custom-menu, menu-bar-showhide-menu) (menu-bar-options-menu, menu-bar-tools-menu) (menu-bar-encryption-decryption-menu, menu-bar-describe-menu) (menu-bar-search-documentation-menu, menu-bar-manuals-menu) (menu-bar-help-menu): * ediff-hook.el (menu-bar-ediff-menu, menu-bar-ediff-merge-menu): * buff-menu.el (Buffer-menu-mode-map): Use menu-bar-separator.
* * keymap.c (Fmake_sparse_keymap): Purecopy the name.Dan Nicolaescu2009-10-241-1/+1
| | | | | | | | | | | | | | | | | | | * eval.c (Fautoload): Purecopy the filename. Simplify. * category.c (Fdefine_category): Purecopy docstring. * international/mule-cmds.el (set-language-info-alist): Purecopy lang-env. (leim-list-header, leim-list-entry-regexp): Change defvars to defconst. (charset): Purecopy the name. (define-char-code-property): Purecopy string arguments. * emacs-lisp/byte-run.el (make-obsolete, make-obsolete-variable): Purecopy string arguments. * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): * ediff-hook.el (menu-bar-ediff-menu): * buff-menu.el (Buffer-menu-mode-map): Purecopy names and tooltips. * bookmark.el (menu-bar-bookmark-map): Add :help and purecopy the name.
* * menu-bar.el: Remove menu-bar-ediff-misc-menu from the ToolsChong Yidong2009-09-271-2/+5
| | | | | | | | | | | | | | | | | | | | | | | menu. * ediff-hook.el: Move menu-bar-ediff-misc-menu into menu-bar-ediff-menu. * emacs-lisp/lisp-mode.el: Add doc-string-elt property to define-overloadable-function. * progmodes/autoconf.el: Provide autoconf as well, so that this file can be `require'd. * emacs-lisp/cl-macs.el (deftype): Add to cl-loaddefs. * emacs-lisp/autoload.el (generated-autoload-feature) (generated-autoload-load-name): New vars. (autoload-rubric, autoload-generate-file-autoloads): Use them. (make-autoload): Recognize define-overloadable-function and defclass forms (for EIEIO). * Makefile.in (update-subdirs): Exclude cedet directory.
* (menu-bar-ediff-menu, menu-bar-ediff-merge-menu)Dan Nicolaescu2009-09-171-58/+58
| | | | | (menu-bar-epatch-menu, menu-bar-ediff-misc-menu): Add purecopy calls for the menu names and :help.
* Add 2009 to copyright years.Glenn Morris2009-01-051-1/+1
|
* 2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-11-231-35/+64
| | | | | | * ediff-hook.el: added tooltips to Emacs menus. * ediff.el: changed date of last update.
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
|
* Fix up comment convention on the arch-tag lines.Stefan Monnier2008-04-101-1/+1
|
* 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-04-041-53/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | * ediff*el: replaced load with require in eval-when-compile. * ediff-hook: deleted all invocations of (autoload ...). * ediff-util.el (ediff-setup): make window-min-height a local variable in ediff control window, and set its min height to 2. (ediff-setup-control-buffer): dedicate the control window. (ediff-toggle-multiframe): undedicate control window. Work directly with ediff-setup-windows-multiframe and ediff-setup-windows-plain. * ediff-wind (ediff-choose-window-setup-function-automatically): new function. (ediff-window-setup-function): change initialization. (ediff-setup-windows-automatic): deleted. (ediff-setup-windows-plain-merge): make control window dedicated. (ediff-destroy-control-frame): do not skip frames if working in a single frame. * emulation/viper-ex.el: move provide's forward, prevent ecursion in eval-when-compile. * emulation/viper-util.el: move provide's forward, prevent ecursion in eval-when-compile.
* Fix typo.Dan Nicolaescu2008-03-141-1/+1
|
* * faces.el (xw-defined-colors):Dan Nicolaescu2008-03-141-122/+1
| | | | | | | | | | | | | | | | | | | | * simple.el (widget-convert, shell-mode): Declare as functions instead of autoloading. * abbrev.el: * button.el: * cus-face.el: * ediff-hook.el: * emacs-lisp/backquote.el: * emacs-lisp/timer.el: * facemenu.el: * faces.el: * menu-bar.el: * simple.el: * subr.el: * textmodes/fill.el: * textmodes/paragraphs.el: Remove autoloads, redundant when the files are preloaded.
* Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.Glenn Morris2008-03-051-197/+177
| | | | | | (ediff-cond-compile-for-xemacs-or-emacs): Remove. (ediff-window-setup-function): Don't autoload declaration for compiler. (ediff-xemacs-init-menus): Use when rather than if.
* * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.Dan Nicolaescu2008-03-051-5/+2
| | | | | | | | | | | | | | | | | | | | | | (standard-mode-line-position): Add mouse-face. * progmodes/compile.el (compilation-menu-map): (compilation-mode-map): * progmodes/grep.el (grep-mode-map): Add :help. * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Define and initialize in one step. Add :help. Use :enable to activate menu items. Show the key binding for edebug-defun. (lisp-interaction-mode-map): Add a menu. * term.el (term-mode-map): Define and initialize in one step. * ediff-init.el (ediff-color-display-p): Simplify. (Xor): Remove unused function. (ediff-with-syntax-table): Simplify for emacs. * ediff-hook.el (menu-bar-ediff-menu): Don't depend on the menu-bar being loaded, it always is.
* Merge from emacs--rel--22Miles Bader2008-01-081-1/+1
|\ | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
| |
* | Merge from emacs--rel--22Miles Bader2007-11-091-11/+11
|\ \ | |/ | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-923
| * (ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,Juanma Barranquero2007-10-301-11/+11
| | | | | | | | | | ediff-buffers3, ebuffers3, erevision, ediff-revision): Fix typos in autoload docstrings.
* | * emulation/edt-mapper.el (function-key-map):Dan Nicolaescu2007-10-211-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (edt-map-key): Make it a function instead of using fset. Inline edt-gnu-map-key and edt-lucid-map-key. Use featurep 'xemacs. (edt-gnu-map-key, edt-lucid-map-key): Remove. (edt-x-emacs-p): Remove. (edt-emacs-variant, edt-window-system, edt-xserver): Use featurep 'xemacs. * net/eudc.el: Use (featurep 'xemacs) instead of the string test. Replace eudc-xemacs-p with its definition. (eudc-xemacs-p, eudc-emacs-p, eudc-xemacs-mule-p) (eudc-emacs-mule-p): Remove. (eudc-install-menu, eudc-mode): Replace eudc-emacs-p and eudc-xemacs-p with feature tests. * net/eudc-bob.el (eudc-bob-generic-menu, eudc-bob-mail-keymap) (eudc-bob-url-keymap, eudc-bob-sound-keymap) (eudc-bob-generic-keymap, eudc-bob-popup-menu) (eudc-bob-toggle-inline-display): * net/eudc-hotlist.el (eudc-hotlist-emacs-menu): Replace eudc-emacs-p and eudc-xemacs-p with feature tests. * net/eudcb-ph.el (eudc-ph-open-session): Replace eudc-xemacs-mule-p with its former definition. * progmodes/octave-mod.el (octave-xemacs-p): Remove. (octave-abbrev-start): Replace octave-xemacs-p with (featurep 'xemacs). * progmodes/vera-mode.el (vera-xemacs): Remove. (vera-mode-syntax-table): Replace vera-xemacs with (featurep 'xemacs). * progmodes/vhdl-mode.el (vhdl-xemacs): Remove. (vhdl-doc-mode, vhdl-doc-variable, vhdl-compile-init) (vhdl-speedbar-initialize, vhdl-ps-print-init) (vhdl-forward-comment, vhdl-mode-map-init, vhdl-show-messages) (vhdl-emacs-22, vhdl-emacs-21): Replace vhdl-xemacs with (featurep 'xemacs). * progmodes/antlr-mode.el (cond-emacs-xemacs-macfn, defunx) (save-buffer-state-x): * obsolete/fast-lock.el (fast-lock-verbose): * emulation/viper-init.el (viper-xemacs-p) (viper-cond-compile-for-xemacs-or-emacs): * emacs-lisp/checkdoc.el (checkdoc-minor-mode-map): * ps-print.el (case-fold-search): * ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs): * calculator.el (calculator-help): Use featurep 'xemacs.
* Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
|
* Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
|
* 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2006-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * viper-cmd.el (viper-insert-state-post-command-sentinel, viper-change-state-to-vi, viper-change-state-to-emacs): made aware of cursor coloring in the emacs state. (viper-special-read-and-insert-char): use read-char-exclusive. (viper-minibuffer-trim-tail): workaround for fields in minibuffer. * viper-init.el (viper-emacs-state-cursor-color): new variable. * viper-util.el (viper-save-cursor-color, viper-get-saved-cursor-color-in-replace-mode, viper-get-saved-cursor-color-in-insert-mode, viper-restore-cursor-color): make aware of the cursor color in emacs state. (viper-get-saved-cursor-color-in-emacs-mode): new function. * ediff-diff.el (ediff-ignore-case, ediff-ignore-case-option, ediff-ignore-case-option3, ediff-actual-diff-options, ediff-actual-diff3-options): new variables to control case sensitivity. (ediff-make-diff2-buffer, ediff-setup-fine-diff-regions, ediff-setup-diff-regions3): made aware of case-sensitivity. (ediff-toggle-ignore-case): new function. (ediff-extract-diffs, ediff-extract-diffs3): preserve point in buffers. * ediff-help.el (ediff-long-help-message-narrow2, ediff-long-help-message-compare2, ediff-long-help-message-compare3, ediff-long-help-message-word-mode): add ignore-case command. (ediff-help-for-quick-help): add ignore-case command. * ediff-merg.el: move provide to the end. * ediff-ptch.el: move provide to the end. * ediff-wind.el: move provide to the end. * ediff-mult.el: move provide to the end. (ediff-set-meta-overlay): enable follow-link. * ediff.el: move provide to the end. Break recursive load cycle in eval-when-compile. (ediff-patch-buffer): better heuristics. * ediff-util.el: move provide to the end. Break recursive load cycle in eval-when-compile. (ediff-setup-keymap): add binding for #c. Replaced some defsubsts with defuns. (ediff-submit-report): pass the values of ediff-diff3-program, ediff-diff3-options.
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-1/+1
|
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-061-1/+2
|
* Update FSF's address.Lute Kamstra2005-07-041-2/+2
|
* (menu-bar-ediff-misc-menu, ediff-misc-menu):Juri Linkov2005-03-281-8/+8
| | | | | | Remove ellipsis from "Ediff Manual", "Customize Ediff", "List Ediff Sessions", "Toggle use of separate control buffer frame", "Use separate frame for Ediff control buffer".
* Add arch taglinesMiles Bader2003-09-011-0/+1
|
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-15/+15
|
* (ediff-cond-compile-for-xemacs-or-emacs): Put theRichard M. Stallman2002-09-191-1/+2
| | | | definition straight into loaddefs.el as well as executing it here.
* 2002-09-18 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-09-181-0/+4
| | | | | | | | | | | | * ediff-hooks.el: Put back the autoloads (for compatibility with XEmacs). * ediff-init.el: Use defalias instead of fset. * ediff-util.el: Use defalias instead of fset. * viper-util.el (viper-chars-in-region): simplification. * viper.el (viper-emacs-state-mode-list): added modes.
* Remove autoload cookies.Richard M. Stallman2002-04-301-4/+0
|
* 2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-04-261-29/+33
| | | | * ediff-hooks.el: Put back the autoloads.
* Delete autoload cookies.Richard M. Stallman2002-02-011-4/+0
|
* 2002-01-08 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-01-081-0/+1
| | | | * ediff-hook.el: added an autoload cookie.
* 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-01-081-93/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): new macro that replaces viper-emacs-p and viper-xemacs-p in many cases. Used to reduce the number of warnings. * viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): moved here from viper.el. (viper-set-unread-command-events): moved to viper-util.el (viper-check-minibuffer-overlay): make sure viper-minibuffer-overlay is moved to cover the entire input field. * viper-util.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-read-key-sequence, viper-set-unread-command-events, viper-char-symbol-sequence-p, viper-char-array-p): moved here. * viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p, viper-event-vector-p): moved to viper-util.el * viper.el (viper-standard-value): moved to viper-cmd.el. Use viper-cond-compile-for-xemacs-or-emacs. * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new macro designed to be used in many places where ediff-emacs-p or ediff-xemacs-p was previously used. Reduces the number of warnings. Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue of ediff-xemacs-p. (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer, ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents): moved to ediff-util.el. (ediff-event-key): moved here. * ediff-merge.el: got rid of unreferenced variables. * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs. (ediff-cleanup-mess): improved the way windows are set up after quitting ediff. (ediff-janitor): use ediff-dispose-of-variant-according-to-user. (ediff-dispose-of-variant-according-to-user): new function designed to be smarter and also understands indirect buffers. (ediff-highlight-diff-in-one-buffer, ediff-unhighlight-diff-in-one-buffer, ediff-unhighlight-diffs-totally-in-one-buffer, ediff-highlight-diff, ediff-highlight-diff, ediff-unhighlight-diff, ediff-unhighlight-diffs-totally, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents, ediff-make-current-diff-overlay): moved here. (ediff-format-bindings-of): new function by Hannu Koivisto <azure@iki.fi>. (ediff-setup): make sure the merge buffer is always widened and modifiable. (ediff-write-merge-buffer-and-maybe-kill): refuse to write the result of a merge into a file visited by another buffer. (ediff-arrange-autosave-in-merge-jobs): check if the merge file is visited by another buffer and ask to save/delete that buffer. (ediff-verify-file-merge-buffer): new function to do the above. * ediff-vers.el: load ediff-init.el at compile time. * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff.el (ediff-windows, ediff-regions-wordwise, ediff-regions-linewise): use indirect buffers to improve robustness and make it possible to compare regions of the same buffer (even overlapping regions). (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): new functions. (ediff-files-internal): refuse to compare identical files. (ediff-regions-internal): get rid of the warning about comparing regions of the same buffer. * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here. Plus the following fixes courtesy of Dave Love: Doc fixes. (ediff-word-1): Use word class and move - to the front per regexp documentation. (ediff-wordify): Bind forward-word-function outside loop. (ediff-copy-to-buffer): Use insert-buffer-substring rather than consing buffer contents. (ediff-goto-word): Move syntax table setting outside loop.
* Some fixes to follow coding conventions.Pavel Janík2001-07-161-1/+2
|
* 2001-01-19 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2001-01-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | * viper.el: call initial-major-mode on startup. * ediff.el (ediff-patch-file): use better defaults. * ediff-vers.el: fix for 8+3 DOS file systems 2001-01-19 Colin Walters <walters@cis.ohio-state.edu> * ediff-util.el (ediff-compare-custom-diffs-maybe): put diff in diff mode, if available. 2001-01-19 Vin Shelton <acs@xemacs.org> * ediff-hook.el (ediff-xemacs-init-menus): fixed add-menu-button 2001-01-19 Steve Youngs <youngs@xemacs.org> * ediff-init.el (subst-char-in-string): Define and use it, unless it's already defined.
* *** empty log message ***Michael Kifer1999-11-011-23/+34
|
* new versionMichael Kifer1997-11-011-4/+5
|
* new versionMichael Kifer1997-07-171-0/+5
|
* new versionMichael Kifer1997-05-311-54/+45
|
* *** empty log message ***Michael Kifer1996-12-281-0/+33
|
* *** empty log message ***Michael Kifer1996-09-201-1/+1
|
* *** empty log message ***Michael Kifer1996-06-221-42/+71
|
* *** empty log message ***Michael Kifer1996-02-161-21/+27
|
* Update FSF's address.Erik Naggum1996-01-141-4/+7
|
* Delete spaces before `...' in menu strings.Karl Heuer1996-01-091-48/+48
|
* (menu-bar-epatch-menu, menu-bar-ediff-merge-menu)Richard M. Stallman1995-11-201-3/+3
| | | | (menu-bar-ediff-menu): Give names to the menus.
* (ediff-show-registry): Use renamed file ediff-mult.Richard M. Stallman1995-11-201-1/+1
|
View Lorry Controller Status