1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-12 09:28:24 +00:00
Commit Graph

46 Commits

Author SHA1 Message Date
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Michael Kifer
b7749a8184 2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-hook.el: added tooltips to Emacs menus.

	* ediff.el: changed date of last update.
2008-11-23 03:30:55 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Stefan Monnier
cbee283dd7 Fix up comment convention on the arch-tag lines. 2008-04-10 14:10:46 +00:00
Michael Kifer
2d84cc270a 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
* 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.
2008-04-04 07:51:27 +00:00
Dan Nicolaescu
732f3104dc Fix typo. 2008-03-14 18:58:17 +00:00
Dan Nicolaescu
f31b125795 * faces.el (xw-defined-colors):
* 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.
2008-03-14 17:42:18 +00:00
Glenn Morris
535b216fa3 Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
(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.
2008-03-05 08:51:06 +00:00
Dan Nicolaescu
388059876a * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
(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.
2008-03-05 04:09:24 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Miles Bader
c12ecb0af9 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-923
2007-11-09 09:45:30 +00:00
Juanma Barranquero
5e6fa73b58 (ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,
ediff-buffers3, ebuffers3, erevision, ediff-revision):
Fix typos in autoload docstrings.
2007-10-30 15:12:08 +00:00
Dan Nicolaescu
f82460271e * emulation/edt-mapper.el (function-key-map):
(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.
2007-10-21 17:22:04 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Michael Kifer
b6178721d8 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
* 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.
2006-02-19 03:16:45 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Thien-Thi Nguyen
0d30b33766 Update years in copyright notice; nfc. 2005-08-06 22:13:43 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
Juri Linkov
24258b53e7 (menu-bar-ediff-misc-menu, ediff-misc-menu):
Remove ellipsis from "Ediff Manual", "Customize Ediff", "List
Ediff Sessions", "Toggle use of separate control buffer frame",
"Use separate frame for Ediff control buffer".
2005-03-28 01:18:22 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Juanma Barranquero
71296446d3 Trailing whitespace deleted. 2003-02-04 11:26:42 +00:00
Richard M. Stallman
a6b194caa8 (ediff-cond-compile-for-xemacs-or-emacs): Put the
definition straight into loaddefs.el as well as executing it here.
2002-09-19 01:02:06 +00:00
Michael Kifer
f3eabcdf40 2002-09-18 Michael Kifer <kifer@cs.stonybrook.edu>
* 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.
2002-09-18 04:23:27 +00:00
Richard M. Stallman
8a76146c4c Remove autoload cookies. 2002-04-30 17:46:15 +00:00
Michael Kifer
abdb213cb6 2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-hooks.el: Put back the autoloads.
2002-04-26 05:17:53 +00:00
Richard M. Stallman
e329ba0e05 Delete autoload cookies. 2002-02-01 04:16:02 +00:00
Michael Kifer
ec78107598 2002-01-08 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-hook.el: added an autoload cookie.
2002-01-08 16:32:10 +00:00
Michael Kifer
50a07e1856 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* 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.
2002-01-08 04:36:01 +00:00
Pavel Janík
3afbc435ac Some fixes to follow coding conventions. 2001-07-16 07:46:48 +00:00
Michael Kifer
2550055a67 2001-01-19 Michael Kifer <kifer@cs.sunysb.edu>
* 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.
2001-01-19 07:13:03 +00:00
Michael Kifer
3af0304a61 *** empty log message *** 1999-11-01 07:16:15 +00:00
Michael Kifer
328b4b7052 new version 1997-11-01 01:46:51 +00:00
Michael Kifer
1e70790f2f new version 1997-07-17 19:37:07 +00:00
Michael Kifer
ddc90f39b0 new version 1997-05-31 01:10:39 +00:00
Michael Kifer
bf5d92c5e3 *** empty log message *** 1996-12-28 02:53:04 +00:00
Michael Kifer
92c51e075e *** empty log message *** 1996-09-20 01:10:05 +00:00
Michael Kifer
bbe6126cba *** empty log message *** 1996-06-22 01:54:34 +00:00
Michael Kifer
4ae69eaccf *** empty log message *** 1996-02-16 06:36:35 +00:00
Erik Naggum
b578f267af Update FSF's address. 1996-01-14 07:34:30 +00:00
Karl Heuer
190271b979 Delete spaces before `...' in menu strings. 1996-01-09 23:16:28 +00:00
Richard M. Stallman
8a10f781cf (menu-bar-epatch-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu): Give names to the menus.
1995-11-20 23:11:39 +00:00
Richard M. Stallman
530d2eb605 (ediff-show-registry): Use renamed file ediff-mult. 1995-11-20 22:05:03 +00:00
Michael Kifer
f9b2678cbc Now defines [window] in menu-bar-ediff-menu. 1995-10-14 03:12:53 +00:00
Michael Kifer
fa2eb9acd2 Initial revision 1995-10-06 00:57:20 +00:00