1. 25 May, 2010 1 commit
    • Stefan Monnier's avatar
      Replace Lisp calls to delete-backward-char by delete-char. · d355a0b7
      Stefan Monnier authored
      * bs.el, expand.el, ido.el, image-dired.el, lpr.el, pcomplete.el,
      skeleton.el, term.el, time.el, wid-edit.el, woman.el,
      calc/calc-graph.el, calc/calc-help.el, calc/calc-incom.el,
      calc/calc.el, emacs-cl-extra.el, emacs-cl-loaddefs.el,
      emulation/cua-rect.el, emulation/viper-ex.el, eshell/esh-test.el,
      eshell/eshell.el, gnus/gnus-uu.el, gnus/nndoc.el, gnus/nnrss.el,
      gnus/rfc2047.el, gnus/utf7.el, international/utf-7.el,
      language/ethio-util.el, mh-e/mh-alias.el, mh-e/mh-search.el,
      net/imap.el, net/rcirc.el, obsolete/complete.el, play/decipher.el,
      progmodes/ada-mode.el, progmodes/cc-awk.el, progmodes/dcl-mode.el,
      progmodes/ps-mode.el, progmodes/verilog-mode.el,
      progmodes/vhdl-mode.el, textmodes/bibtex.el, textmodes/fill.el,
      textmodes/reftex-auc.el, textmodes/rst.el, textmodes/sgml-mode.el,
      textmodes/table.el, textmodes/texinfmt.el: Replace Lisp calls to
      delete-backward-char by calls to delete-char.
      d355a0b7
  2. 13 Jan, 2010 1 commit
  3. 03 Nov, 2009 1 commit
    • Stefan Monnier's avatar
      * url-util.el (url-insert-entities-in-string): · 937e6a56
      Stefan Monnier authored
      * url-nfs.el (url-nfs-unescape):
      * url-ldap.el (url-ldap):
      * url-imap.el (url-imap):
      * url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
      * erc.el (erc-display-line-1, erc-process-away):
      * erc-truncate.el (erc-truncate-buffer-to-size):
      Use with-current-buffer.
      * term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
      * play/mpuz.el (mpuz-create-buffer):
      * play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
      (lm-print-y,s,noise, lm-print-w0, lm-init):
      * play/gomoku.el (gomoku-prompt-for-move):
      * play/fortune.el (fortune-in-buffer):
      * play/dissociate.el (dissociated-press):
      * play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
      (decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
      * mail/supercite.el (sc-eref-show):
      * mail/smtpmail.el (smtpmail-send-it):
      * mail/rmailsum.el (rmail-summary-next-labeled-message)
      (rmail-summary-previous-labeled-message, rmail-summary-wipe)
      (rmail-summary-undelete-many, rmail-summary-rmail-update)
      (rmail-summary-goto-msg, rmail-summary-expunge)
      (rmail-summary-get-new-mail, rmail-summary-search-backward)
      (rmail-summary-add-label, rmail-summary-output-menu)
      (rmail-summary-output-body):
      * mail/rfc822.el (rfc822-addresses):
      * mail/reporter.el (reporter-dump-variable, reporter-dump-state):
      * mail/mailpost.el (post-mail-send-it):
      * mail/hashcash.el (hashcash-generate-payment):
      * mail/feedmail.el (feedmail-run-the-queue)
      (feedmail-queue-send-edit-prompt-help-first)
      (feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
      (feedmail-deduce-address-list):
      * eshell/esh-ext.el (eshell-remote-command):
      * eshell/em-unix.el (eshell-occur-mode-mouse-goto):
      * emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
      (viper-wildcard-to-regexp, viper-glob-mswindows-files)
      (viper-save-string-in-file, viper-valid-marker):
      * emulation/viper-keym.el (viper-toggle-key):
      * emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
      (ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
      (ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
      * emulation/viper-cmd.el (viper-exec-form-in-vi)
      (viper-exec-form-in-emacs, viper-brac-function):
      * emulation/viper.el (viper-delocalize-var):
      * emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
      (vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
      (vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
      (ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
      * emulation/vi.el (vi-switch-mode, vi-ex-cmd):
      * emulation/edt.el (edt-electric-helpify):
      * emulation/cua-rect.el (cua--rectangle-aux-replace):
      * emulation/cua-gmrk.el (cua--insert-at-global-mark)
      (cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
      (cua-indent-to-global-mark-column):
      * calendar/diary-lib.el (calendar-mark-1):
      * calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
      Use with-current-buffer.
      * emulation/viper.el (viper-delocalize-var): Use dolist.
      937e6a56
  4. 22 Aug, 2009 1 commit
  5. 05 Jan, 2009 1 commit
  6. 31 Jul, 2008 1 commit
    • Dan Nicolaescu's avatar
      * bitmaps/README: · 7c2fb837
      Dan Nicolaescu authored
      * 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.
      7c2fb837
  7. 06 May, 2008 1 commit
  8. 10 Apr, 2008 1 commit
  9. 06 Apr, 2008 1 commit
    • Michael Kifer's avatar
      2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu> · a5254f37
      Michael Kifer authored
      	* 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.
      a5254f37
  10. 04 Apr, 2008 1 commit
    • Michael Kifer's avatar
      2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu> · 2d84cc27
      Michael Kifer authored
      	* 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.
      2d84cc27
  11. 03 Apr, 2008 1 commit
    • Michael Kifer's avatar
      2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu> · 2ee00512
      Michael Kifer authored
      	* viper-macs.el (viper-read-fast-keysequence): use viper-read-event
      	instead of viper-read-key.
      
      	* viper.el (viper-mode): move the check for fundamental mode.
      
      	* viper-utils.el (viper-get-saved-cursor-color-in-replace-mode)
      	viper-get-saved-cursor-color-in-insert-mode): get rid of redundant
      	let-statements.
      
      	* viper*.el: replaced load with require in eval-when-compile.
      2ee00512
  12. 01 Mar, 2008 1 commit
  13. 09 Jan, 2008 1 commit
    • Michael Kifer's avatar
      2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu> · 65efc538
      Michael Kifer authored
      	* 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.
      65efc538
  14. 07 Jan, 2008 1 commit
  15. 02 Dec, 2007 1 commit
  16. 27 Nov, 2007 1 commit
  17. 09 Nov, 2007 1 commit
    • Dan Nicolaescu's avatar
      * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove. · e83d1fe8
      Dan Nicolaescu authored
      (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.
      e83d1fe8
  18. 02 Nov, 2007 1 commit
    • Michael Kifer's avatar
      2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu> · 33468a59
      Michael Kifer authored
      	* 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.
      33468a59
  19. 19 Aug, 2007 1 commit
    • Michael Kifer's avatar
      2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu> · 69441214
      Michael Kifer authored
      	* 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.
      69441214
  20. 25 Jul, 2007 1 commit
  21. 21 Jan, 2007 1 commit
  22. 23 Oct, 2006 1 commit
    • Michael Kifer's avatar
      2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu> · 7eb605c7
      Michael Kifer authored
      	* viper-cmd.el (viper-prefix-arg-com): define gg as G0
      
      	* viper-ex.el (ex-read): quote file argument.
      
      	* ediff-diff.el (ediff-same-file-contents): expand file names.
      
      	* ediff-mult.el (ediff-append-custom-diff): quote shell file arguments.
      7eb605c7
  23. 25 Aug, 2006 1 commit
    • Michael Kifer's avatar
      2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu> · 83f49acb
      Michael Kifer authored
      	* viper.el (viper-set-hooks): use frame bindings for
      	viper-vi-state-cursor-color.
      	(viper-non-hook-settings): don't set default
      	mode-line-buffer-identification.
      
      	* viper-util.el (viper-set-cursor-color-according-to-state): new
      	function.
      	(viper-set-cursor-color-according-to-state,
      	viper-get-saved-cursor-color-in-replace-mode,
      	viper-get-saved-cursor-color-in-insert-mode): make conditional on
      	viper-emacs-state-cursor-color.
      
      	* viper-cmd.el (viper-envelop-ESC-key): bug fix.
      	(viper-undo): use point if undo-beg-posn is nil.
      	(viper-insert-state-post-command-sentinel,viper-change-state-to-emacs,
      	viper-after-change-undo-hook): don't use
      	viper-emacs-state-cursor-color by default.
      	(viper-undo): more sensible positioning after undo.
      
      	* viper-ex.el (ex-splice-args-in-1-letr-cmd): got rid of caddr.
      	(viper-emacs-state-cursor-color): default to nil, since this feature
      	doesn't work well yet.
      
      	* ediff-mult.el (ediff-intersect-directories,
      	ediff-get-directory-files-under-revision, ediff-dir-diff-copy-file):
      	always expand filenames.
      83f49acb
  24. 06 Feb, 2006 1 commit
  25. 18 Sep, 2005 1 commit
  26. 01 Aug, 2005 1 commit
  27. 04 Jul, 2005 2 commits
  28. 22 May, 2005 1 commit
  29. 17 May, 2005 1 commit
  30. 16 May, 2005 1 commit
  31. 19 Feb, 2005 1 commit
    • Michael Kifer's avatar
      * viper-cmd.el (viper-prefix-commands): make into a defconst. · 3f9526a3
      Michael Kifer authored
      	(viper-exec-buffer-search): use regexp-quote to quote the buffer
      	string.
      	(viper-minibuffer-setup-sentinel): make some variables buffer-local.
      	(viper-skip-separators): bug fix.
      	(viper-set-searchstyle-toggling-macros): allow to unset macros in a
      	particular major mode.
      	(viper-del-backward-char-in-replace): don't put deleted char on the
      	kill ring.
      
      	* viper-ex.el (viper-color-display-p): new function.
      	(viper-has-face-support-p): use viper-color-display-p.
      
      	* viper-keym.el (viper-gnus-modifier-map): new keymap.
      
      	* viper-macs.el (viper-unrecord-kbd-macro): bug fix.
      
      	* viper-util.el (viper-glob-unix-files): fix shell status check.
      	(viper-file-remote-p): make equivalent to file-remote-p.
      
      	* viper.el (viper-major-mode-modifier-list): use
      	viper-gnus-modifier-map.
      3f9526a3
  32. 16 Apr, 2004 1 commit
  33. 08 Feb, 2004 1 commit
  34. 08 Sep, 2003 1 commit
  35. 01 Sep, 2003 1 commit
  36. 04 Feb, 2003 1 commit
  37. 30 Aug, 2002 1 commit
  38. 16 Apr, 2002 1 commit
    • Michael Kifer's avatar
      * viper-ex.el: Patch by Samuel Padgett. Copyright papers received. · 241d963d
      Michael Kifer authored
      	(viper-ex-print-buf-name): New variable.
      	(viper-ex-print-buf): New variable.
      	(ex-token-alist): Invoke ex-print on ":print" Ex commands.
      	(ex-g-marks): New variable.
      	(ex-print): New function.
      	(ex-print-display-lines): New function.
      
      	* viper.el (viper-set-hooks): add window-setup-hook, which sets
      	the cursor color.
      
      	* ediff-util.el (ediff-cleanup-mess): delete ctl window on exit
      	when the window is not in its own frame.
      	(ediff-clone-buffer-for-region-comparison): more robust window
      	arrangement while prompting for regions to compare.
      	(ediff-make-cloned-buffer): use generate-new-buffer-name.
      	(ediff-inferior-compare-regions): deleted unused vars
      	ctl-buf and quit-now.
      241d963d
  39. 08 Jan, 2002 1 commit
    • Michael Kifer's avatar
      2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> · 50a07e18
      Michael Kifer authored
      	* 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.
      50a07e18