1. 25 Jul, 2014 1 commit
  2. 18 Jun, 2014 1 commit
    • Juri Linkov's avatar
      * lisp/vc/ediff-init.el (ediff-current-diff-Ancestor) · 382ceb2c
      Juri Linkov authored
      (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):
      Add `min-colors 88' version with removed black/white foregrounds.
      
      Fixes: debbugs:10181
      382ceb2c
  3. 03 May, 2014 1 commit
    • Stefan Monnier's avatar
      * lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): · e6cf6ca0
      Stefan Monnier authored
      Use nil rather than `default' for the "default" appearance.
      * lisp/vc/ediff-util.el (ediff-inferior-compare-regions)
      (ediff-toggle-autorefine, ediff-unselect-difference): Don't use
      a misleading `default' value when it's really a boolean.
      * lisp/vc/ediff-init.el (ediff-set-overlay-face): Don't set help-echo if the
      overlay is not visible.
      
      Fixes: debbugs:17388
      e6cf6ca0
  4. 10 Apr, 2014 1 commit
    • Stefan Monnier's avatar
      Ediff's overlay priorities cause more trouble than they solve. · e46561a2
      Stefan Monnier authored
      * lisp/vc/ediff-init.el (ediff-shadow-overlay-priority): Remove variable.
      (ediff-highest-priority): Remove function.
      * lisp/vc/ediff-util.el (ediff-highlight-diff-in-one-buffer):
      * lisp/vc/ediff-diff.el (ediff-set-diff-overlays-in-one-buffer)
      (ediff-set-fine-diff-properties-in-one-buffer): Don't mess with
      overlay priorities.
      
      Fixes: debbugs:17234
      e46561a2
  5. 16 Feb, 2014 1 commit
  6. 01 Jan, 2014 1 commit
  7. 05 Sep, 2013 1 commit
    • Daniel Hackney's avatar
      * lisp/dired-x.el: · 6c42fc3e
      Daniel Hackney authored
      * lisp/net/ange-ftp.el:
      * lisp/net/browse-url.el:
      * lisp/net/dbus.el:
      * lisp/net/eudc.el:
      * lisp/net/eudcb-ldap.el:
      * lisp/net/eww.el:
      * lisp/net/imap.el:
      * lisp/printing.el:
      * lisp/vc/ediff-diff.el:
      * lisp/vc/ediff-init.el:
      * lisp/vc/ediff-merg.el:
      * lisp/vc/ediff-mult.el:
      * lisp/vc/ediff-util.el:
      * lisp/vc/ediff-wind.el:
      * lisp/vc/ediff.el:
      * lisp/vc/emerge.el:
      * lisp/vc/pcvs.el:
      * vc/vc-annotate.el: Prefix unused arguments with `_' to silence
      byte compiler.  Remove some unused let-bound variables.
      6c42fc3e
  8. 01 Jan, 2013 1 commit
  9. 30 Sep, 2012 1 commit
    • Juri Linkov's avatar
      * lisp/facemenu.el (list-colors-sort): Add option "Luminance". · d80d54b2
      Juri Linkov authored
      (list-colors-sort-key): Implement it.
      
      * lisp/vc/diff-mode.el (diff-refine-removed):
      * lisp/vc/ediff-init.el (ediff-fine-diff-A):
      * lisp/vc/smerge-mode.el (smerge-refined-removed):
      Change background color "#ffaaaa" to "#ffbbbb".
      
      Fixes: debbugs:10181
      d80d54b2
  10. 25 Sep, 2012 1 commit
    • Chong Yidong's avatar
      Use declare forms, where possible, to mark obsolete functions. · 59f7af81
      Chong Yidong authored
      * lisp/allout.el (allout-passphrase-hint-string): Likewise.
      (allout-init): Use a declare form to mark obsolete.
      
      * lisp/calendar/calendar.el (calendar-version):
      * lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
      (icalendar-convert-diary-to-ical):
      * lisp/cus-edit.el (custom-mode):
      * lisp/ansi-color.el (ansi-color-unfontify-region):
      * lisp/international/latin1-disp.el (latin1-char-displayable-p):
      * lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
      * lisp/progmodes/which-func.el (which-func-update-1): Use
      define-obsolete-function-alias.
      
      * lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
      this function obsolete.
      
      * lisp/calendar/cal-x.el (calendar-two-frame-setup)
      (calendar-only-one-frame-setup, calendar-one-frame-setup):
      * lisp/calendar/calendar.el (american-calendar, european-calendar)
      (calendar-for-loop):
      * lisp/comint.el (comint-dynamic-simple-complete)
      (comint-dynamic-complete-as-filename, comint-unquote-filename):
      * lisp/desktop.el (desktop-load-default):
      * lisp/dired-x.el (dired-omit-here-always)
      (dired-hack-local-variables, dired-default-directory):
      * lisp/emacs-lisp/derived.el (derived-mode-class):
      * lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
      * lisp/emacs-lock.el (toggle-emacs-lock):
      * lisp/epa.el (epa-display-verify-result):
      * lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
      (epg-passphrase-callback-function):
      * lisp/eshell/esh-util.el (eshell-for):
      * lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
      (eshell-add-to-window-buffer-names):
      * lisp/files.el (locate-file-completion):
      * lisp/imenu.el (imenu-example--create-c-index)
      (imenu-example--create-lisp-index)
      (imenu-example--lisp-extract-index-name)
      (imenu-example--name-and-position):
      * lisp/international/mule-cmds.el (princ-list):
      * lisp/international/mule-diag.el (decode-codepage-char):
      * lisp/international/mule-util.el (detect-coding-with-priority):
      * lisp/iswitchb.el (iswitchb-read-buffer):
      * lisp/mail/mailalias.el (mail-complete):
      * lisp/mail/sendmail.el (mail-sent-via):
      * lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
      (mouse-major-mode-menu):
      * lisp/password-cache.el (password-read-and-add):
      * lisp/pcomplete.el (pcomplete-parse-comint-arguments):
      * lisp/progmodes/sh-script.el (sh-maybe-here-document):
      * lisp/replace.el (query-replace-regexp-eval):
      * lisp/savehist.el (savehist-load):
      * lisp/simple.el (choose-completion-delete-max-match):
      * lisp/term.el (term-dynamic-simple-complete):
      * lisp/vc/ediff-init.el (ediff-check-version):
      * lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
      * lisp/vc/vc.el (vc-diff-switches-list):
      * lisp/view.el (view-return-to-alist-update): Likewise.
      
      * lisp/iswitchb.el (iswitchb-read-buffer): Move code of
      iswitchb-define-mode-map here, and delete that obsolete function.
      
      * lisp/subr.el (eval-next-after-load, makehash, insert-string)
      (assoc-ignore-representation, assoc-ignore-case): Use declare to
      mark obsolete.
      (mode-line-inverse-video): Variable deleted.
      
      * lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
      this applies to functions.
      
      * lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.
      
      * lisp/international/mule-util.el (string-to-sequence): Remove.
      
      * lisp/net/newst-backend.el (newsticker-cache-filename):
      * lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
      incorrect obsolescence declaration.
      
      * lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
      font-lock-reference-face.
      
      * lisp/url/url-parse.el (url-recreate-url-attributes):
      * lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
      obsolete.
      
      * src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
      59f7af81
  11. 25 May, 2012 1 commit
    • Juri Linkov's avatar
      Use the same diff color scheme as in modern VCSes (bug#10181). · bc1b21bb
      Juri Linkov authored
      * lisp/vc/diff-mode.el (diff-header, diff-file-header): Remove "green"
      to avoid confusion with `diff-added' that now uses green colors.
      (diff-removed): Use shades of red.
      (diff-added): Use shades of green.
      (diff-changed): Leave just the yellow color.
      (diff-use-changed-face): New variable.
      (diff-font-lock-keywords): Use `diff-use-changed-face' to decide
      how to highlight context diff changes.
      (diff-refine-change): Use shades of yellow.
      (diff-refine-removed): New face that uses shades of red.
      (diff-refine-added): New face that uses shades of green.
      (diff-refine-hunk): Use `diff-refine-change', `diff-refine-added',
      `diff-refine-removed' in the call to `smerge-refine-subst'
      depending on the value of `diff-use-changed-face'.
      
      * lisp/vc/ediff-init.el (ediff-current-diff-A, ediff-fine-diff-A):
      Add face condition `min-colors 88' with shades of red.
      (ediff-current-diff-B, ediff-fine-diff-B): Add face condition
      `min-colors 88' with shades of green.
      (ediff-current-diff-C, ediff-fine-diff-C): Add face condition
      `min-colors 88' with shades of yellow.
      
      * lisp/vc/smerge-mode.el (smerge-mine): Use shades of red.
      (smerge-other): Use shades of green.
      (smerge-base): Use shades of yellow.
      (smerge-refined-change): Empty face.
      (smerge-refined-removed): New face that uses shades of red.
      (smerge-refined-added): New face that uses shades of green.
      (smerge-refine-subst): Rename arg `props' to `props-c'.  Add new
      args `props-r' and `props-a', and use them.  Doc fix.
      (smerge-refine): Evaluate `smerge-use-changed-face' and depending
      on its value use different faces `smerge-refined-change',
      `smerge-refined-removed', `smerge-refined-added' in the call to
      `smerge-refine-subst'.
      bc1b21bb
  12. 26 Apr, 2012 1 commit
    • Chong Yidong's avatar
      Adapt ediff window handling to multi-tty. · f08ae1c9
      Chong Yidong authored
      * vc/ediff-init.el: Always define ediff-pixel-width/height.
      
      * vc/ediff-wind.el (ediff-setup-windows-default): New function.
      (ediff-window-setup-function): Use it as the default, to set up
      windows based on whether the current frame is graphical.
      (ediff-choose-window-setup-function-automatically): Make obsolete.
      
      Fixes: debbugs:2138
      f08ae1c9
  13. 09 Apr, 2012 1 commit
  14. 19 Feb, 2012 1 commit
  15. 05 Jan, 2012 1 commit
  16. 04 Dec, 2011 1 commit
  17. 14 Nov, 2011 1 commit
  18. 23 Oct, 2011 1 commit
    • Chong Yidong's avatar
      Make vc-toggle-read-only an alias for toggle-read-only. · 86c60681
      Chong Yidong authored
      It hasn't worked in a VC sense since 2008-05-02T07:12:59Z!esr@snark.thyrsus.com, though this was
      not documented at the time (grr).
      
      * lisp/vc/vc-hooks.el (vc-toggle-read-only): Make it an obsolete alias
      for toggle-read-only.  Note that this hasn't called vc-next-action
      since 2008-05-02, though it wasn't documented at the time.
      
      * lisp/files.el (toggle-read-only): Remove obsolete comment about
      version control.
      
      * doc/emacs/buffers.texi (Misc Buffer): Don't mention vc-toggle-read-only.
      
      * lisp/cedet/ede.el (ede-maybe-checkout): Function deleted;
      vc-toggle-read-only does not do version control now.
      
      * lisp/cedet/ede/project-am.el (project-remove-file, project-add-file)
      (project-new-target): Don't call ede-maybe-checkout.
      
      * lisp/cedet/ede/util.el (ede-make-buffer-writable): Don't use
      vc-toggle-read-only.
      
      * lisp/vc/ediff-init.el (ediff-toggle-read-only-function): Use
      toggle-read-only.
      86c60681
  19. 03 Mar, 2011 1 commit
    • David Abrahams's avatar
      ediff-init.el fix for bug#1821. (tiny change) · 31128af6
      David Abrahams authored
      Tiny change; note that author said he placed it in the public domain.
      (If this wasn't a tiny change, we would still need paperwork.)
      
      * lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
      Move ediff-defvar-local calls after defcustoms.
      31128af6
  20. 25 Jan, 2011 1 commit
  21. 15 Jan, 2011 1 commit
  22. 02 Oct, 2010 1 commit
    • Glenn Morris's avatar
      Remove some functions, variables and aliases obsolete since at least 21.1. · 3226d6ca
      Glenn Morris authored
      * doc/misc/misc.texi (Shell Mode): Remove reference to old function name.
      
      * src/character.c (Fchar_bytes): Remove obsolete function.
      (syms_of_character): Remove Schar_bytes.
      * lisp/subr.el (char-bytes): Remove obsolete function.
      
      * lisp/emacs-lisp/checkdoc.el (checkdoc-minor-keymap): Remove obsolete alias.
      
      * lisp/isearch.el (isearch-return-char): Remove obsolete function.
      
      * lisp/mouse.el: No longer provide mldrag.
      (mldrag-drag-mode-line, mldrag-drag-vertical-line):
      Remove obsolete aliases.
      
      * lisp/comint.el (comint-kill-output): Remove obsolete alias.
      
      * lisp/shell.el: Comment fix.
      
      * lisp/composite.el (decompose-composite-char): Remove obsolete function.
      * lisp/ps-def.el (decompose-composite-char): Remove unused function.
      
      * lisp/iswitchb.el (iswitchb-default-keybindings): Remove obsolete function.
      
      * lisp/outline.el (outline-visible): Remove obsolete function.
      
      * lisp/term/pc-win.el (x-frob-font-slant, x-frob-font-weight):
      * lisp/faces.el (internal-find-face, internal-get-face)
      (frame-update-faces, frame-update-face-colors)
      (x-frob-font-weight, x-frob-font-slant)
      (internal-frob-font-weight, internal-frob-font-slant)
      (x-make-font-bold, x-make-font-demibold, x-make-font-unbold)
      (x-make-font-italic, x-make-font-oblique, x-make-font-unitalic)
      (x-make-font-bold-italic): Remove functions and aliases, obsolete
      since Emacs 21.1.
      * lisp/emulation/viper-util.el (viper-get-face):
      * lisp/obsolete/lucid.el (find-face, get-face): Use facep.
      * lisp/vc/ediff-init.el (ediff-valid-color-p, ediff-get-face):
      Remove unused functions.
      * lisp/vc/ediff-util.el (ediff-submit-report): Doc fix.
      
      * etc/NEWS: Mention above changes.
      3226d6ca
  23. 29 Aug, 2010 1 commit
  24. 11 Jun, 2010 1 commit
    • Juri Linkov's avatar
      Move version control related files to the "vc" subdirectory. · 56b2854f
      Juri Linkov authored
      * 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.
      56b2854f
  25. 13 Jan, 2010 1 commit
  26. 07 Dec, 2009 1 commit
    • Michael Kifer's avatar
      2009-12-07 Michael Kifer <kifer@cs.stonybrook.edu> · 2de386ca
      Michael Kifer authored
      	* ediff-init.el (ediff-event-key): use event-to-character instead of
      	event-key.
      
      	* ediff-mult.el (ediff-setup-meta-map, ediff-prepare-meta-buffer): add
      	menus to the meta mode. (Dan Nicolaescu's <dann@ics.uci.edu> patch.)
      
      	* ediff.el (ediff-buffers-internal): add unwind-protect.
      2de386ca
  27. 22 Nov, 2009 1 commit
    • Michael Kifer's avatar
      2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu> · 433d9ace
      Michael Kifer authored
      	* 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.
      433d9ace
  28. 15 Aug, 2009 1 commit
    • Michael Kifer's avatar
      2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu> · 68b962d4
      Michael Kifer authored
      	* viper-cmd.el (viper-insert-isearch-string): new function.
      	(viper-if-string): redefine C-s in the minibuffer to insert the last
      	incremental search string.
      
      	* ediff-init.el (ediff-coding-system): use escape-quoted in case of
      	XEmacs.
      
      	* ediff-merg.el (ediff-merge-region-is-non-clash-to-skip,
      	ediff-merge-region-is-non-clash,
      	ediff-skip-merge-region-if-changed-from-default-p): use defun.
      	Also check if the job is really a merge job.
      
      	* ediff.el (ediff-current-file): new function.
      68b962d4
  29. 05 Jan, 2009 1 commit
  30. 03 Dec, 2008 1 commit
    • Lute Kamstra's avatar
      * align.el: · 9201cc28
      Lute Kamstra authored
      * allout.el:
      * apropos.el:
      * arc-mode.el:
      * autoinsert.el:
      * avoid.el:
      * battery.el:
      * bookmark.el:
      * buff-menu.el:
      * calculator.el:
      * chistory.el:
      * cmuscheme.el:
      * comint.el:
      * compare-w.el:
      * dabbrev.el:
      * delim-col.el:
      * desktop.el:
      * diff-mode.el:
      * diff.el:
      * dired-aux.el:
      * dired-x.el:
      * dired.el:
      * dos-vars.el:
      * ediff-diff.el:
      * ediff-help.el:
      * ediff-init.el:
      * ediff-merg.el:
      * ediff-mult.el:
      * ediff-ptch.el:
      * ediff-vers.el:
      * ediff-wind.el:
      * ediff.el:
      * emerge.el:
      * facemenu.el:
      * faces.el:
      * ffap.el:
      * filecache.el:
      * find-dired.el:
      * font-core.el:
      * font-lock.el:
      * forms.el:
      * fringe.el:
      * help-at-pt.el:
      * hippie-exp.el:
      * ido.el:
      * image-file.el:
      * imenu.el:
      * indent.el:
      * info.el:
      * isearchb.el:
      * iswitchb.el:
      * jit-lock.el:
      * jka-compr.el:
      * log-edit.el:
      * lpr.el:
      * ls-lisp.el:
      * man.el:
      * menu-bar.el:
      * midnight.el:
      * mouse-sel.el:
      * mouse.el:
      * msb.el:
      * outline.el:
      * paren.el:
      * pcmpl-cvs.el:
      * pcmpl-gnu.el:
      * pcomplete.el:
      * pcvs-info.el:
      * pcvs-parse.el:
      * printing.el:
      * ps-mule.el:
      * ps-print.el:
      * replace.el:
      * ruler-mode.el:
      * saveplace.el:
      * sb-image.el:
      * scroll-bar.el:
      * sha1.el:
      * shadowfile.el:
      * shell.el:
      * sort.el:
      * speedbar.el:
      * strokes.el:
      * tempo.el:
      * term.el:
      * terminal.el:
      * time-stamp.el:
      * time.el:
      * tree-widget.el:
      * type-break.el:
      * vc-cvs.el:
      * vc-hg.el:
      * vc-mcvs.el:
      * vc-rcs.el:
      * vc-sccs.el:
      * vc.el:
      * view.el:
      * w32-vars.el:
      * whitespace.el:
      * wid-edit.el: Remove leading * from docstrings of defcustoms,
      deffaces, defconsts and defuns.
      9201cc28
  31. 19 Oct, 2008 1 commit
  32. 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
  33. 06 May, 2008 1 commit
  34. 03 May, 2008 1 commit
  35. 23 Apr, 2008 1 commit
  36. 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
  37. 05 Mar, 2008 2 commits
    • Glenn Morris's avatar
      Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test. · 4af37d74
      Glenn Morris authored
      (ediff-cond-compile-for-xemacs-or-emacs): Remove.
      (top-level, ediff-frame-iconified-p): Simplify if+and to just and.
      (ediff-read-event, ediff-overlayp, ediff-make-overlay, ediff-delete-overlay):
      Move the XEmacs test inside the definition.
      4af37d74
    • Dan Nicolaescu's avatar
      * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip. · 38805987
      Dan Nicolaescu authored
      (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.
      38805987
  38. 04 Mar, 2008 1 commit
  39. 07 Jan, 2008 1 commit