summaryrefslogtreecommitdiff
path: root/lisp/ediff-util.el
Commit message (Collapse)AuthorAgeFilesLines
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-4291/+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.
* * ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) byJuri Linkov2010-02-031-2/+2
| | | | '(RCS SCCS) with inverted condition.
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
|
* (ediff-minibuffer-with-setup-hook): New compatibility macro.Juri Linkov2009-11-291-1/+7
| | | | (ediff-read-file-name): Use it instead of `minibuffer-with-setup-hook'.
* Provide additional default values (directories at other DiredJuri Linkov2009-11-251-15/+19
| | | | | | | | | | | | | | | | windows) via M-n in the minibuffer of some Dired commands. * dired-aux.el (dired-diff, dired-compare-directories) (dired-do-create-files): Use `dired-dwim-target-defaults' to set `minibuffer-default' in `minibuffer-with-setup-hook'. (dired-dwim-target-directory): Find a window that displays Dired buffer instead of failing when the next window is not Dired. Use `get-window-with-predicate' to find for the next Dired window. (dired-dwim-target-defaults): New function. * ediff-util.el (ediff-read-file-name): Use `dired-dwim-target-defaults' to set `minibuffer-default' in `minibuffer-with-setup-hook'.
* 2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2009-11-221-13/+13
| | | | | | | | | | | | | | | | | | | * viper-cmd.el: use viper-last-command-char instead of last-command-char/last-command-event. (viper-prefix-arg-value): do correct conversion of event-char for XEmacs. * viper-util.el, viper.el: use viper-last-command-char instead of last-command-char/last-command-event. * ediff-init.el, ediff-mult.el, ediff-util.el: relpace last-command-char and last-command-event with (ediff-last-command-char) everywhere. * ediff-vers.el (ediff-rcs-get-output-buffer): make sure the buffer is created in fundamental mode. * ediff.el (ediff-version): revert the change of interactive-p to called-interactively-p.
* * x-dnd.el (x-dnd-maybe-call-test-function):Stefan Monnier2009-11-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.el (split-window-vertically): * whitespace.el (whitespace-help-on): * vc-rcs.el (vc-rcs-consult-headers): * userlock.el (ask-user-about-lock-help) (ask-user-about-supersession-help): * type-break.el (type-break-force-mode-line-update): * time-stamp.el (time-stamp-conv-warn): * terminal.el (te-set-output-log, te-more-break, te-filter) (te-sentinel,terminal-emulator): * term.el (make-term, term-exec, term-sentinel, term-read-input-ring) (term-write-input-ring, term-check-source, term-start-output-log): (term-display-buffer-line, term-dynamic-list-completions): (term-ansi-make-term, serial-term): * subr.el (selective-display): * strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer) (strokes-encode-buffer, strokes-xpm-for-compressed-string): * speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info) (speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support) (speedbar-remove-localized-speedbar-support) (speedbar-set-mode-line-format, speedbar-create-tag-hierarchy) (speedbar-update-special-contents, speedbar-buffer-buttons-engine) (speedbar-buffers-line-directory): * simple.el (shell-command-on-region, append-to-buffer) (prepend-to-buffer): * shadowfile.el (shadow-save-todo-file): * scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1) (scroll-bar-maybe-set-window-start): * sb-image.el (speedbar-image-dump): * saveplace.el (save-place-alist-to-file, save-places-to-alist) (load-save-place-alist-from-file): * ps-samp.el (ps-print-message-from-summary): * ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox) (ps-background-image, ps-begin-job, ps-do-despool): * ps-bdf.el (bdf-find-file, bdf-read-font-info): * printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting) (pr-ps-message-from-summary, pr-lpr-message-from-summary): (pr-call-process, pr-file-list, pr-interface-save): * novice.el (disabled-command-function) (enable-command, disable-command): * mouse.el (mouse-buffer-menu-alist): * mouse-copy.el (mouse-kill-preserving-secondary): * macros.el (kbd-macro-query): * ledit.el (ledit-go-to-lisp, ledit-go-to-liszt): * informat.el (batch-info-validate): * ido.el (ido-copy-current-word, ido-initiate-auto-merge): * hippie-exp.el (try-expand-dabbrev-visible): * help-mode.el (help-make-xrefs): * help-fns.el (describe-variable): * generic-x.el (bat-generic-mode-run-as-comint): * finder.el (finder-mouse-select): * find-dired.el (find-dired-sentinel): * filesets.el (filesets-file-close): * files.el (list-directory): * faces.el (list-faces-display, describe-face): * facemenu.el (list-colors-display): * ezimage.el (ezimage-image-association-dump, ezimage-image-dump): * epg.el (epg--process-filter, epg-cancel): * epa.el (epa--marked-keys, epa--select-keys, epa-display-info) (epa--read-signature-type): * emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B) (emerge-file-names): * ehelp.el (electric-helpify): * ediff.el (ediff-regions-wordwise, ediff-regions-linewise): * ediff-vers.el (rcs-ediff-view-revision): * ediff-util.el (ediff-setup): * ediff-mult.el (ediff-append-custom-diff): * ediff-diff.el (ediff-exec-process, ediff-process-sentinel) (ediff-wordify): * echistory.el (Electric-command-history-redo-expression): * dos-w32.el (find-file-not-found-set-buffer-file-coding-system): * disp-table.el (describe-display-table): * dired.el (dired-find-buffer-nocreate): * dired-aux.el (dired-rename-subdir, dired-dwim-target-directory): * dabbrev.el (dabbrev--same-major-mode-p): * chistory.el (list-command-history): * apropos.el (apropos-documentation): * allout.el (allout-obtain-passphrase): (allout-copy-exposed-to-buffer): (allout-verify-passphrase): Use with-current-buffer.
* * ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remoteMichael Albinus2009-06-081-5/+2
| | | | files correctly.
* Replace last-command-char with last-command-event.Glenn Morris2009-01-091-13/+13
|
* Add 2009 to copyright years.Glenn Morris2009-01-051-1/+1
|
* 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-11-161-4/+9
| | | | | | | | | | | | | | | | | | | | | | | * viper-init.el (viper-ESC-keyseq-timeout): Make it into a function instead of a variable. * viper-util.el (viper-fast-keysequence-p): Changed to use viper-ESC-keyseq-timeout as a function. (viper-get-saved-cursor-color-in-replace-mode): Use defun instead of defsubst. * viper-cmd.el: Let line-move-visual to nil when using next-line or previous-line. (viper-R-state-post-command-sentinel): Use defun instead of defsubst. * viper-keym.el (viper-ESC-key): Use (kbd "ESC"). * ediff-util.el (ediff-toggle-multiframe): Check if control window is live. (ediff-save-buffer): Let window-min-height to 2. * ediff-wind.el (ediff-setup-windows-plain-compare): Avoid selecting the minibuffer.
* (ediff-make-temp-file): Unconditionally bind coding-system-for-writeEli Zaretskii2008-10-191-5/+1
| | | | to ediff-coding-system-for-write.
* * bitmaps/README:Dan Nicolaescu2008-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * xfns.c: * termcap.c: * term.c: * syswait.h: * systty.h: * systime.h: * syssignal.h: * sysdep.c: * process.h: * process.c: * print.c: * ndir.h: * lread.c: * keyboard.c: * getpagesize.h: * floatfns.c: * fileio.c: * emacs.c: * doc.c: * dispnew.c: * dired.c: * data.c: * callproc.c: * buffer.c: * README: * Makefile.in: * s/template.h: * s/msdos.h: * m/vax.h: Remove VMS support. * s/vms.h: * vlimit.h: * uaf.h: * temacs.opt: * param.h: * ioctl.h: Remove file. * descrip.mms: * compile.com: Remove file. * Create.c: Remove VMS support. * message.el (Module): * gnus-start.el (Module): * gnus-registry.el (Module): * textmodes/texinfmt.el: * nxml/nxml-enc.el: * mail/feedmail.el: * international/mule.el: * international/latexenc.el: * emulation/viper-util.el: * emulation/viper-init.el: * emulation/viper-ex.el: * emacs-lisp/bytecomp.el: * version.el: * subr.el: * startup.el: * sort.el: * shadowfile.el: * recentf.el: * printing.el: * paths.el: * minibuffer.el: * ls-lisp.el: * loadup.el: * hippie-exp.el: * finder.el: * files.el: * ediff-util.el: * ediff-ptch.el: * ediff-init.el: * ediff-diff.el: * dired.el: * dired-aux.el: * cus-edit.el: * bindings.el: * arc-mode.el: * add-log.el: Remove VMS support. * obsolete/vmsproc.el: * obsolete/vms-pmail.el: * obsolete/vms-patch.el: Remove file. * etags.c: * emacsclient.c: Remove VMS support. * termcap.src: Remove file. * README: * PROBLEMS: * MACHINES: Remove VMS info. * ediff.texi: Remove VMS support. * os.texi: * intro.texi: * files.texi: Remove VMS support. * emacs.texi: Remove VMS support. * make-dist: * README: Remove VMS support. * vms: Remove directory.
* * progmodes/flymake.el (flymake-save-buffer-in-file):Stefan Monnier2008-05-281-1/+1
| | | | | | | | * shadowfile.el (shadow-copy-file): * arc-mode.el (archive-*-write-file-member): * files.el (diff-buffer-with-file): * subr.el (with-temp-file): Pass nil to write-region. * jka-compr.el (jka-compr-write-region): Preserve `start's nullness.
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
|
* Simplify compilation requirements.Glenn Morris2008-05-031-17/+2
|
* 2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-04-061-1/+4
| | | | | | | | | * viper*.el (viper-search-wrap-around-t): replace with viper-search-wrap-around. * ediff*.el: replace 3-argument 'require' statements with 1-argument ones (wrapped in if's). For compatibility with the current stable version of XEmacs.
* 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-04-041-35/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.Glenn Morris2008-03-051-69/+41
| | | | | | | | (ediff-kill-bottom-toolbar): Place (ediff-use-toolbar-p) test inside XEmacs test. (ediff-make-bottom-toolbar): Place whole cond inside XEmacs test, since it was doing nothing on Emacs. (ediff-make-bullet-proof-overlay): Use when rather than if.
* * ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote files.Michael Albinus2008-02-031-8/+10
|
* 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-01-101-3/+4
| | | | | | * ediff*.el: uncommented declare-function. * viper*.el: uncommented declare-function.
* 2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-01-091-2/+7
| | | | | | | | | | | | | | | | * ediff*.el: commented out declare-function. "make bootstrap" stops with an error and emacs does not compile with those things in. Besides, declare-function is not defined in XEmacs. * ediff-util (eqiff-quit): autoraise minibuffer. * ediff-diff (ediff-convert-fine-diffs-to-overlays): make it a defin * viper*.el: commented out declare-function -- not defined in XEmacs. * viper-ex.el (viper-info-on-file): take care of indiret buffers. * viper.el (viper-set-hooks, set-cursor-color): set viper-vi-state-cursor-color.
* 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
| |
* | (ediff-version): Declare as a function.Glenn Morris2007-12-051-0/+3
| |
* | * ediff-util.el (ediff-setup):Dan Nicolaescu2007-12-031-0/+3
| | | | | | | | | | * ediff-diff.el (ediff-prepare-error-list): Disable undo for ediff-error-buffer.
* | Load ediff-*.el files silently.Glenn Morris2007-11-271-11/+7
| | | | | | | | Don't load reporter when compiling.
* | * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.Dan Nicolaescu2007-11-091-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version) (ediff-current-diff-A, ediff-current-diff-B) (ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A) (ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A) (ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor) (ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C) (ediff-odd-diff-Ancestor, ediff-reset-mouse): * ediff-wind.el (ediff-narrow-control-frame-leftward-shift) (ediff-setup-windows-plain-merge) (ediff-setup-windows-plain-compare, ediff-setup-control-frame) (ediff-refresh-control-frame, ediff-get-visible-buffer-window): * ediff-util.el (ediff-setup-keymap, ) (ediff-toggle-wide-display, ediff-toggle-multiframe) (ediff-toggle-use-toolbar, ediff-really-quit) (ediff-good-frame-under-mouse) (ediff-highlight-diff-in-one-buffer) (ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1) (ediff-make-bullet-proof-overlay): * ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p) (ediff-set-meta-overlay): * ediff-help.el (ediff-help-region-map, ediff-set-help-overlays): * ediff.el (ediff-documentation): Replace ediff-xemacs-p and ediff-emacs-p with their former definitions. * emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove. (viper-has-face-support-p, viper-inactivate-input-method) (viper-activate-input-method) (viper-use-replace-region-delimiters, viper-restore-cursor-type): * emulation/viper-mous.el (viper-multiclick-timeout) (viper-surrounding-word, viper-mouse-click-insert-word) (viper-mouse-click-search-word, viper-parse-mouse-key): * emulation/viper-macs.el (viper-char-array-to-macro): * emulation/viper.el (viper-go-away, viper-set-hooks) (viper-non-hook-settings): * emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode) (viper-get-saved-cursor-color-in-insert-mode) (viper-get-saved-cursor-color-in-emacs-mode) (viper-check-version, viper-get-visible-buffer-window) (viper-file-checked-in-p, viper-set-replace-overlay) (viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay) (viper-check-minibuffer-overlay, viper-read-key-sequence) (viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p with their former definitions. (viper-eventify-list-xemacs): Only do work for XEmacs. (viper-set-unread-command-events): Only do work for Emacs. (viper-overlay-p, viper-make-overlay, viper-overlay-live-p) (viper-move-overlay, viper-overlay-start, viper-overlay-end) (viper-overlay-get, viper-overlay-put, viper-read-event) (viper-characterp, viper-int-to-char, viper-get-face) (viper-color-defined-p, viper-iconify): New defaliases replacing the old fsets. * progmodes/fortran.el (comment-region-function) (uncomment-region-function): Pacify byte compiler. * vc.el (vc-diff-internal): Remove code for an old version of gnus.
* | 2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2007-11-021-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * viper-ex.el (viper-ex): do not ignore the region. * viper-cmd.el (viper-prev-destructive-command) (viper-insert-prev-from-insertion-ring): use ring-copy instead of copy-sequence. * ediff-util.el (ediff-make-current-diff-overlay): do not use face-name. Got rid of ediff-copy-list. * ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): do not use face-name. (ediff-test-utility,ediff-diff-mandatory-option) (ediff-reset-diff-options): removed to simplify yhe mandatory option handling on windows. (ediff-set-diff-options): added. (ediff-diff-options): changed. * ediff-vers.el (ediff-vc-internal): use ediff-vc-revision-other-window. (ediff-vc-merge-internal): use ediff-vc-revision-other-window and ediff-vc-working-revision. Require vc-hooks.
* | * ediff-util.el (ediff-nuke-selective-display): Move definition toDan Nicolaescu2007-11-011-22/+19
| | | | | | | | | | | | | | top level, make it dependent on the emacs flavor. * play/gamegrid.el (gamegrid-kill-timer, gamegrid-start-timer): Test for XEmacs not for itimer.
* | (ediff-file-checked-out-p)Dan Nicolaescu2007-10-311-2/+2
| | | | | | | | (ediff-file-checked-in-p): Only call vc-locking-user for XEmacs.
* | (ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,Juanma Barranquero2007-09-251-26/+26
| | | | | | | | ediff-clear-diff-vector): Use `mapc' rather than `mapcar'.
* | 2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2007-08-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * viper.el (viper-remove-hooks): remove some additional viper hooks when the user calls viper-go-away. (viper-go-away): restore the default of default-major-mode. Save the value of default-major-mode before vaperization. * viper-cmd.el: Replace error "" with "Viper bell". * viper-ex.el: Replace error "" with "Viper bell". * ediff-util.el (ediff-make-temp-file): use the coding system of the buffer for which file is created.
* | Merge from emacs--rel--22Miles Bader2007-07-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Patches applied: * emacs--rel--22 (patch 70-73) - Update from CVS 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
| * Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
| |
* | Fix up comment convention.Stefan Monnier2007-05-251-6/+6
|/
* 2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2007-01-231-2/+7
| | | | | | | | | | | * ediff-util.el (ediff-clone-buffer-for-region-comparison): change text of message. Activate mark. (ediff-activate-mark): set transient-mark-mode to t. * ediff.el (ediff-regions-wordwise,ediff-regions-linewise): changed docstrings. * viper-keym.el (viper-insert-basic-map): deleted binding for S-TAB.
* Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
|
* * viper.el: Bumped up version/date of update to reflect the substantialMichael Kifer2006-09-181-0/+5
| | | | | | | | | | | changes done in August 2006. * viper-cmd (viper-next-line-at-bol): make sure button-at, push-button are defined. * ediff-util.el (ediff-add-to-history): new function. * ediff.el: use ediff-add-to-history instead of add-to-history.
* 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2006-02-191-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
|
* 2005-11-15 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-11-151-1/+1
| | | | | * ediff-util (ediff-make-temp-file): use proper file-name-handler operation
* 2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-11-041-0/+1
| | | | | | | | * ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not merging. * ediff-util.el (ediff-previous-difference): don't skip regions that have merge clashes.
* 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-10-061-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ediff-merge.el (ediff-merge-region-is-non-clash): new defsubst. (ediff-merge-region-is-non-clash-to-skip): previouslu called ediff-merge-region-is-non-clash. * ediff-mult.el (ediff-append-custom-diff,ediff-meta-show-patch): use insert-buffer-substring. * ediff-ptch.el (ediff-fixup-patch-map): use better heuristics for selecting files to patch. Also bug fixes. * ediff-util.el (ediff-setup): bug fix. (ediff-next-difference): Never skip clashes that differ in white space only. * ediff-wind.el (ediff-setup-control-frame,ediff-destroy-control-frame): check the menubar feature. * viper-cmd.el (viper-normalize-minor-mode-map-alist, viper-refresh-mode-line): use make-local-variable to localize some vars instead of make-variable-buffer-local. Suggested by Stefan Monnier. * viper-init.el (viper-make-variable-buffer-local): delete alias. (viper-restore-cursor-type,viper-set-insert-cursor-type): use make-local-variable instead of make-variable-buffer-local. Suggested by Stefan Monnier. * viper.el (viper-mode): don't use viper-make-variable-buffer-local. (viper-comint-mode-hook): use make-local-variable on require-final-newline. (viper-non-hook-settings): don't use make-variable-buffer-local.
* 2005-09-25 Romain Francoise <romain@orebokech.com>Romain Francoise2005-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dired-aux.el (dired-copy-file-recursive): * dired.el (dired-delete-file): * ediff-mult.el (ediff-dir-diff-copy-file): * ediff-util.el (ediff-test-save-region): * forms.el (forms-mode): * ido.el (ido-file-internal, ido-delete-file-at-head): * log-edit.el (log-edit-done): * ses.el (ses-yank-resize): * play/gomoku.el (gomoku-human-plays, gomoku) (gomoku-human-resigns, gomoku-prompt-for-other-game) (gomoku-offer-a-draw): * play/landmark.el (lm-human-resigns, lm): * net/eudcb-ldap.el (eudc-ldap-check-base): * play/mpuz.el (mpuz-offer-abort, mpuz-try-letter, mpuz-close-game): * progmodes/ebrowse.el (ebrowse-find-pattern): * progmodes/idlw-shell.el (idlwave-shell-set-bp-check): * textmodes/reftex-index.el (reftex-index-initialize-phrases-buffer): End `yes-or-no-p' and `y-or-n-p' prompts with question mark and space. * vc.el (vc-delete-file): * play/gomoku.el (gomoku-terminate-game, gomoku) (gomoku-prompt-for-move, gomoku-human-takes-back): * play/landmark.el (lm-human-takes-back, lm-prompt-for-move) (lm-start-robot, lm-human-plays): Remove extraneous spaces in messages.
* 2005-09-24 Emilio C. Lopes <eclig@gmx.net>Romain Francoise2005-09-241-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * woman.el (woman-file-name): * wid-edit.el (widget-file-prompt-value) (widget-coding-system-prompt-value): * w32-fns.el (set-w32-system-coding-system): * vc.el (vc-version-diff, vc-annotate): * textmodes/reftex-auc.el (reftex-arg-cite) (reftex-arg-index-tag): * textmodes/refer.el (refer-get-bib-files): * textmodes/artist.el (artist-figlet-choose-font): * terminal.el (terminal-emulator): * replace.el (occur-read-primary-args): * rect.el (string-rectangle, string-insert-rectangle): * ps-print.el (ps-print-preprint): * progmodes/pascal.el (pascal-goto-defun): * progmodes/etags.el (visit-tags-table, visit-tags-table-buffer): * progmodes/compile.el (compilation-find-file): * printing.el (pr-interactive-n-up): * play/animate.el (animate-birthday-present): * net/rcompile.el (remote-compile): * man.el (man, Man-goto-section, Man-follow-manual-reference): * mail/rmailsum.el (rmail-summary-search-backward) (rmail-summary-search): * mail/rmailout.el (rmail-output-read-rmail-file-name) (rmail-output-read-file-name): * mail/rmail.el (rmail-search, rmail-search-backwards): * mail/mailabbrev.el (merge-mail-abbrevs, rebuild-mail-abbrevs): * locate.el (locate): * international/quail.el (quail-show-keyboard-layout): * international/mule.el (set-buffer-file-coding-system) (revert-buffer-with-coding-system, set-file-name-coding-system) (set-terminal-coding-system, set-keyboard-coding-system) (set-next-selection-coding-system): * international/mule-diag.el (describe-coding-system) (describe-font, describe-fontset): * international/mule-cmds.el (universal-coding-system-argument) (search-unencodable-char, describe-input-method) (set-language-environment, describe-language-environment): * international/codepage.el (codepage-setup): * international/code-pages.el (codepage-setup): * info.el (Info-search, Info-follow-reference) (Info-search-backward): * emacs-lisp/advice.el (ad-read-advised-function) (ad-read-advice-class, ad-clear-cache, ad-activate) (ad-deactivate, ad-update, ad-unadvise, ad-read-advice-name) (ad-enable-advice, ad-disable-advice, ad-remove-advice) (ad-read-regexp): * ediff-util.el (ediff-toggle-regexp-match): * ediff-ptch.el (ediff-prompt-for-patch-file): * dired-aux.el (dired-diff): * diff.el (diff): * cus-edit.el (custom-variable-prompt): * calendar/timeclock.el (timeclock-ask-for-project): * calc/calcalg3.el (calc-get-fit-variables): * calc/calc-store.el (calc-edit-variable) (calc-permanent-variable): * vc-mcvs.el (vc-mcvs-register): * shadowfile.el (shadow-define-literal-group): * woman.el (woman-file-name): * vc.el (vc-version-diff, vc-merge): * textmodes/reftex-index.el (reftex-index-complete-tag): * format.el (format-decode-buffer, format-decode-region): * emulation/viper-cmd.el (viper-read-string-with-history): * emacs-lisp/debug.el (cancel-debug-on-entry): * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): * ediff.el (ediff-merge-revisions) (ediff-merge-revisions-with-ancestor, ediff-revision): * completion.el (interactive-completion-string-reader): * calc/calc-prog.el (calc-user-define-formula): Follow convention for reading with the minibuffer.
* 2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ediff-ptch.el (ediff-file-name-sans-prefix): treat nil as an empty string. (ediff-fixup-patch-map): better heuristic for intuiting the file names to patch. (ediff-prompt-for-patch-file): more intuitive prompt. * ediff-util.el: use insert-buffer-substring. * ediff-vers.el (cvs-run-ediff-on-file-descriptor): bug fix. * viper-cmd.el (viper-change-state): don't move over the field boundaries in the minibuffer. (viper-set-minibuffer-style): add viper-minibuffer-post-command-hook. (viper-minibuffer-post-command-hook): new hook. (viper-line): don't move cursor at bolp. * viper-ex.el (ex-pwd, viper-info-on-file): fixed message * viper-init.el: add alias to make-variable-buffer-local to avoid compiler warnings. * viper-macs.el (ex-map): better messages. * viper-utils.el (viper-beginning-of-field): new function. * viper.el: replace make-variable-buffer-local with viper-make-variable-buffer-local everywhere, to avoid warnings.
* Message format spec fixes (1)Deepak Goel2005-09-181-3/+3
|
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-061-1/+1
|
* * viper-cmd.el (viper--key-maps): new variable.Michael Kifer2005-07-101-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (viper-normalize-minor-mode-map-alist): use viper--key-maps and emulation-mode-map-alists. (viper-envelop-ESC-key): use viper-subseq. (viper-search-forward/backward/next): disable debug-on-error. * viper-keym.el (viper-toggle-key,viper-quoted-insert-key, viper-ESC-key): new defcustoms. * viper-macs.el (ex-map-read-args): use viper-subseq. * viper-util.el (viper-key-to-emacs-key): use viper-subseq. (viper-subseq): copy of subseq from cl.el. * viper.el (viper-go-away,viper-set-hooks): use emulation-mode-map-alists, advise self-insert-command, add-minor-mode. * viper-mous.el (viper-current-frame-saved): use defvar. * viper-init.el: got rid of -face in face names. * ediff-diff.el (ediff-extract-diffs,ediff-extract-diffs3): Make it work with longlines mode * ediff-mult.el (ediff-meta-mode-hook): new variable. * ediff-ptch.el (ediff-file-name-sans-prefix): quote regexp. * ediff-init: got rid of -face in face names.
View Lorry Controller Status