summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-util.el
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year to 2019Paul Eggert2019-01-011-1/+1
| | | | Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
| | | | Run admin/update-copyright.
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-1/+1
| | | | | | | | | | | | | Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
* ediff: use user-error rather than debug-ignored-errorsGlenn Morris2017-04-171-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/ediff-diff.el (ediff-prepare-error-list): * lisp/vc/ediff-help.el (ediff-help-for-quick-help): * lisp/vc/ediff-init.el (ediff-barf-if-not-control-buffer) (ediff-check-version): * lisp/vc/ediff-merg.el (ediff-shrink-window-C): * lisp/vc/ediff-mult.el (ediff-draw-dir-diffs, ediff-show-dir-diffs) (ediff-append-custom-diff, ediff-meta-show-patch) (ediff-filegroup-action, ediff-show-meta-buffer, ediff-show-registry) (ediff-get-meta-info, ediff-patch-file-form-meta): * lisp/vc/ediff-ptch.el (ediff-patch-file-internal): * lisp/vc/ediff-util.el (ediff-toggle-autorefine) (ediff--check-ancestor-exists, ediff-toggle-read-only) (ediff-toggle-wide-display, ediff-toggle-multiframe) (ediff-toggle-use-toolbar, ediff-toggle-show-clashes-only) (ediff-next-difference, ediff-previous-difference) (ediff-pop-diff, ediff-read-file-name, ediff-verify-file-buffer) (ediff-save-buffer): * lisp/vc/ediff-wind.el (ediff-make-wide-display): * lisp/vc/ediff.el (ediff-find-file, ediff-buffers-internal) (ediff-directories-internal, ediff-directory-revisions-internal) (ediff-regions-wordwise, ediff-regions-linewise) (ediff-load-version-control): Use user-error. (debug-ignored-errors): No longer modify.
* Remove references to OS/2 in code, doc, and commentsGlenn Morris2017-04-081-10/+8
| | | | | | | | | | | | | | | | | * lisp/gnus/nnheader.el (nnheader-read-timeout) (nnheader-file-name-translation-alist): Remove OS/2 case, and simplify. * lisp/emulation/viper-util.el (viper-color-defined-p): * lisp/net/pop3.el (pop3-read-timeout): * lisp/net/imap.el (imap-read-timeout): * lisp/url/url-privacy.el (url-setup-privacy-info): Remove OS/2 case. * lisp/emulation/viper-ex.el (viper-glob-function): * lisp/vc/ediff-util.el (ediff-submit-report): Doc fix. * lisp/cus-edit.el (custom-display): Remove "pm" (OS/2). * doc/emacs/msdos-xtra.texi (MS-DOS): * doc/misc/gnus.texi (Various Various): * doc/misc/viper.texi (Rudimentary Changes): Remove mentions of OS/2. ; * lisp/url/url.el, lisp/url/url-vars.el: ; * lisp/progmodes/cperl-mode.el: Remove old comments.
* Show ancestor buffer in 3way mergesTino Calancha2017-03-141-55/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option ediff-show-ancestor', to control if the ancestor buffer must be shown in 3way merges (Bug#25493); set it non-nil by default. Add a toggle to change this option interactively; the original value of the option is restored on exit. Update the window setup so that the ancestor buffer is shown in 3way merges when ediff-show-ancestor is non-nil. Any operation on ediff windows must take in account the ancestor window as well, when this is shown. * lisp/vc/ediff-init.el (ediff-show-ancestor): New option. (ediff--show-ancestor-orig): New defvar. * lisp/vc/ediff-wind.el (ediff-window-Ancestor): New defvar. (ediff-setup-windows-plain-merge, ediff-setup-windows-multiframe-merge): Display ancestor buffer if ediff-show-ancestor is non-nil. (ediff-keep-window-config): Expect ancestor window in ediff-window-config-saved. (ediff-window-alist): Add entry for the ancestor window. * lisp/vc/ediff-util.el (ediff-setup-control-buffer): ediff-window-config-saved contains ancestor window. (ediff-show-ancestor): Delete this command. (ediff-setup-keymap): Bind ediff-toggle-show-ancestor to '/' for merge jobs. (ediff-update-diffs): Compute new diffs using ancestor buffer in 3way merges; don't cheat it to think that is performing a comparison, that trick is not necessary anymore: simply call 'ediff-setup-diff-regions-function' with file-A, file-B and the file ancestor. (ediff-recenter): Update doc string. Consider the ancestor buffer. (ediff--check-ancestor-exists): New defun. (ediff-toggle-show-ancestor): New command; toggle ediff-show-ancestor. (ediff--restore-options-on-exit): Restore ediff-show-ancestor on exit. (ediff-scroll-vertically, ediff-scroll-horizontally) (ediff-operate-on-windows): Consider the ancestor as well. * lisp/vc/ediff-help.el (ediff-long-help-message-merge): List ediff-toggle-show-ancestor. * doc/misc/ediff.texi (Introduction, Quick Help Commands): Update manual. ; * etc/NEWS: Announce these changes.
* Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\ | | | | | | | | 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
| | | | | | | | Run admin/update-copyright.
* | Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9adb101 Document 'describe-fontset' 229315c ; Add missing symbol quoting. 3d94931 Repair desktop restoration on text terminals 43022f9 Ignore forward-sexp-function in js-mode indentation code b19fb49 Improve documentation of 'define-coding-system' 467768f Fix Bug#25162 6db78ae Fix a typo in define-abbrev-table 5f7d906 Bump makeinfo requirement from 4.7 to 4.13 442e2f6 Fixes related to select-enable-clipboard e4ac450 Define struct predicate before acccesors 08decbd Doc fix for vc-git 5531e75 Further improve make-dist checking 953bf67 Improve previous make-dist change 129645a Make make-dist --snapshot do some sanity checks # Conflicts: # lisp/menu-bar.el
| * ; Add missing symbol quoting.Philipp Stephani2016-12-181-1/+1
| | | | | | | | * lisp/vc/ediff-util.el (ediff-janitor): Add missing symbol quoting.
* | Merge from origin/emacs-25Paul Eggert2016-12-071-0/+2
|\ \ | |/ | | | | | | | | | | ba2847f ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. ... 8b43f97 * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046) c20035c ; * doc/emacs/programs.texi (Man Page): Fix last change. 93d8346 Improve indexing of 'man'
| * ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046)Eli Zaretskii2016-12-021-1/+1
| |
| * * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046)Eli Zaretskii2016-12-021-0/+2
| |
* | Prevent to apply funcall on tStefan Monnier2016-07-121-1/+3
| | | | | | | | | | * lisp/vc/ediff-util.el (ediff-really-quit): Ignore the global part of 'ediff-after-quit-hook-internal' hook (Bug#23933).
* | * lisp/vc/ediff-util.el: Use lexical-binding.Stefan Monnier2016-05-041-12/+16
| |
* | No need to test for jka-comprLars Ingebrigtsen2016-04-301-5/+2
| | | | | | | | | | * lisp/vc/ediff-util.el (ediff-file-compressed-p): jka-compr is always available; no need to test (bug#18204).
* | Be more verbose when changing frame mode in ediffTino Calancha2016-02-231-3/+5
|/ | | | | | | * lisp/vc/ediff-util.el (ediff-toggle-multiframe): Say what mode we toggled to (bug#21853). Copyright-paperwork-exempt: yes
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
| | | | Run admin/update-copyright.
* Avoid redisplay error in ediff-regions-wordwiseEli Zaretskii2015-09-281-0/+1
| | | | | | * lisp/vc/ediff-util.el (ediff-clone-buffer-for-region-comparison): Make sure the mark is set before activating it. (Bug#21567)
* Backslash cleanup in Elisp source filesPaul Eggert2015-09-171-9/+9
| | | | | | | | | | | This patch should not change behavior. It typically omits backslashes where they are redundant (e.g., in the string literal "^\$"). In a few places, insert backslashes where they make regular expressions clearer: e.g., replace "^\*" (equivalent to "^*") with "^\\*", which has the same effect as a regular expression. Also, use ‘\ %’ instead of ‘\%’ when avoiding confusion with SCCS IDs, and similarly use ‘\ $’ instead of ‘\$’ when avoiding confusion with RCS IDs, as that makes it clearer that the backslash is intended.
* Fix minor text quoting in calc, calendar, vcPaul Eggert2015-08-281-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/calc/calc-ext.el (calc-shift-Z-prefix-help): * lisp/calc/calc-help.el (calc-j-prefix-help): * lisp/calc/calc-misc.el (calc-help): * lisp/calc/calc.el (calc-algebraic-mode, calc-mode): Escape an apostrophe in a docstring. * lisp/calc/calc-forms.el (calc-hms-notation): * lisp/calc/calc-mode.el (calc-display-raw, calc-algebraic-mode): Escape an apostrophe in a diagnostic. * lisp/calc/calc-misc.el (calc-help): * lisp/calendar/diary-lib.el (diary-include-files): * lisp/calendar/todo-mode.el (todo-prefix, todo-item-mark): * lisp/vc/diff-mode.el (diff-delete-trailing-whitespace): * lisp/vc/ediff-diff.el (ediff-same-contents): * lisp/vc/ediff-merg.el (ediff-re-merge): * lisp/vc/ediff-ptch.el (ediff-patch-file-internal): * lisp/vc/ediff-util.el (ediff-test-save-region) (ediff-status-info): * lisp/vc/ediff.el (ediff-merge-revisions) (ediff-merge-revisions-with-ancestor): * lisp/vc/pcvs.el (cvs-mode-checkout, cvs-vc-command-advice): * lisp/vc/vc-cvs.el (vc-cvs-mode-line-string): Respect text quoting style in doc string or diagnostic. * lisp/calc/calc-prog.el (calc-kbd-push, calc-kbd-pop): * lisp/vc/add-log.el (change-log-goto-source): Avoid double-formatting. * lisp/vc/ediff-init.el (format-message): New backward-compatibility alias.
* Prefer "this" to “this” in doc stringsPaul Eggert2015-05-191-1/+1
| | | | | | | | | | | | This mostly just straightens quotes introduced in my previous patch. Suggested by Dmitry Gutov in: http://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00565.html * lisp/faces.el, lisp/gnus/gnus-group.el, lisp/ldefs-boot.el: * lisp/mail/supercite.el, lisp/net/tramp.el, lisp/recentf.el: * lisp/textmodes/artist.el, lisp/textmodes/rst.el: * lisp/textmodes/tildify.el, lisp/vc/ediff-util.el: * lisp/vc/log-edit.el, lisp/xt-mouse.el: Prefer straight double quotes to curved double quotes in doc strings.
* Fix minor quoting problems in doc stringsPaul Eggert2015-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were glitches regardless of how or whether we tackle the problem of grave accent in doc strings. * lisp/calc/calc-aent.el (math-restore-placeholders): * lisp/ido.el (ido-ignore-buffers, ido-ignore-files): * lisp/leim/quail/cyrillic.el ("bulgarian-alt-phonetic"): * lisp/leim/quail/hebrew.el ("hebrew-new") ("hebrew-biblical-sil"): * lisp/leim/quail/thai.el ("thai-kesmanee"): * lisp/progmodes/idlw-shell.el (idlwave-shell-file-name-chars): Used curved quotes to avoid ambiguities like ‘`''’ in doc strings. * lisp/calendar/calendar.el (calendar-month-abbrev-array): * lisp/cedet/semantic/mru-bookmark.el (semantic-mrub-cache-flush-fcn): * lisp/cedet/semantic/symref.el (semantic-symref-tool-baseclass): * lisp/cedet/semantic/tag.el (semantic-tag-copy) (semantic-tag-components): * lisp/cedet/srecode/cpp.el (srecode-semantic-handle-:cpp): * lisp/cedet/srecode/texi.el (srecode-texi-texify-docstring): * lisp/emacs-lisp/byte-opt.el (byte-optimize-all-constp): * lisp/emacs-lisp/checkdoc.el (checkdoc-message-text-engine): * lisp/emacs-lisp/generator.el (iter-next): * lisp/gnus/gnus-art.el (gnus-treat-strip-list-identifiers) (gnus-article-mode-syntax-table): * lisp/net/rlogin.el (rlogin-directory-tracking-mode): * lisp/net/soap-client.el (soap-wsdl-get): * lisp/net/telnet.el (telnet-mode): * lisp/org/org-compat.el (org-number-sequence): * lisp/org/org.el (org-remove-highlights-with-change) (org-structure-template-alist): * lisp/org/ox-html.el (org-html-link-org-files-as-html): * lisp/play/handwrite.el (handwrite-10pt, handwrite-11pt) (handwrite-12pt, handwrite-13pt): * lisp/progmodes/f90.el (f90-mode, f90-abbrev-start): * lisp/progmodes/idlwave.el (idlwave-mode, idlwave-check-abbrev): * lisp/progmodes/verilog-mode.el (verilog-tool) (verilog-string-replace-matches, verilog-preprocess) (verilog-auto-insert-lisp, verilog-auto-insert-last): * lisp/textmodes/makeinfo.el (makeinfo-options): * src/font.c (Ffont_spec): Fix minor quoting problems in doc strings, e.g., missing quote, ``x'' where `x' was meant, etc. * lisp/erc/erc-backend.el (erc-process-sentinel-2): Fix minor quoting problem in other string. * lisp/leim/quail/ethiopic.el ("ethiopic"): * lisp/term/tvi970.el (tvi970-set-keypad-mode): Omit unnecessary quotes. * lisp/faces.el (set-face-attribute, set-face-underline) (set-face-inverse-video, x-create-frame-with-faces): * lisp/gnus/gnus-group.el (gnus-group-nnimap-edit-acl): * lisp/mail/supercite.el (sc-attribs-%@-addresses) (sc-attribs-!-addresses, sc-attribs-<>-addresses): * lisp/net/tramp.el (tramp-methods): * lisp/recentf.el (recentf-show-file-shortcuts-flag): * lisp/textmodes/artist.el (artist-ellipse-right-char) (artist-ellipse-left-char, artist-vaporize-fuzziness) (artist-spray-chars, artist-mode, artist-replace-string) (artist-put-pixel, artist-text-see-thru): * lisp/vc/ediff-util.el (ediff-submit-report): * lisp/vc/log-edit.el (log-edit-changelog-full-paragraphs): Use double-quotes rather than TeX markup in doc strings. * lisp/skeleton.el (skeleton-pair-insert-maybe): Reword to avoid the need for grave accent and apostrophe. * lisp/xt-mouse.el (xterm-mouse-tracking-enable-sequence): Don't use grave and acute accents to quote.
* Fix selective diff browsing in EdiffEli Zaretskii2015-05-141-0/+2
| | | | | | * lisp/vc/ediff-util.el (ediff-focus-on-regexp-matches): Go to the beginning of the region before searching for the ediff-regexp-focus-* regexps. (Bug#20568)
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
| | | | Run admin/update-copyright.
* ediff: Replace obsolete toggle-read-only with read-only-modeGlenn Morris2014-07-251-5/+5
| | | | | | * lisp/vc/ediff-init.el (ediff-toggle-read-only-function): * lisp/vc/ediff-util.el (ediff-toggle-read-only): Replace obsolete toggle-read-only with read-only-mode.
* * lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):Stefan Monnier2014-05-021-3/+3
| | | | | | | | | | | 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
* Ediff's overlay priorities cause more trouble than they solve.Stefan Monnier2014-04-101-2/+0
| | | | | | | | | | | * 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
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
|
* * lisp/dired-x.el:Daniel Hackney2013-09-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | * 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.
* Do not call to `selected-window' where it is assumed by default.Dmitry Antipov2013-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected functions are `window-minibuffer-p', `window-dedicated-p', `window-hscroll', `window-width', `window-height', `window-buffer', `window-frame', `window-start', `window-point', `next-window' and `window-display-table'. * abbrev.el (abbrev--default-expand): * bs.el (bs--show-with-configuration): * buff-menu.el (Buffer-menu-mouse-select): * calc/calc.el (calc): * calendar/calendar.el (calendar-generate-window): * calendar/diary-lib.el (diary-simple-display, diary-show-all-entries) (diary-make-entry): * comint.el (send-invisible, comint-dynamic-complete-filename) (comint-dynamic-simple-complete, comint-dynamic-list-completions): * completion.el (complete): * dabbrev.el (dabbrev-expand, dabbrev--make-friend-buffer-list): * disp-table.el (describe-current-display-table): * doc-view.el (doc-view-insert-image): * ebuff-menu.el (Electric-buffer-menu-mouse-select): * ehelp.el (with-electric-help): * emacs-lisp/easy-mmode.el (easy-mmode-define-navigation): * emacs-lisp/edebug.el (edebug-two-window-p, edebug-pop-to-buffer): * emacs-lisp/helper.el (Helper-help-scroller): * emulation/cua-base.el (cua--post-command-handler-1): * eshell/esh-mode.el (eshell-output-filter): * ffap.el (ffap-gnus-wrapper): * help-macro.el (make-help-screen): * hilit-chg.el (highlight-compare-buffers): * hippie-exp.el (hippie-expand, try-expand-dabbrev-visible): * hl-line.el (global-hl-line-highlight): * icomplete.el (icomplete-simple-completing-p): * isearch.el (isearch-done): * jit-lock.el (jit-lock-stealth-fontify): * mail/rmailsum.el (rmail-summary-scroll-msg-up): * lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling): * mpc.el (mpc-tagbrowser, mpc): * net/rcirc.el (rcirc-any-buffer): * play/gomoku.el (gomoku-max-width, gomoku-max-height): * play/landmark.el (landmark-max-width, landmark-max-height): * play/zone.el (zone): * progmodes/compile.el (compilation-goto-locus): * progmodes/ebrowse.el (ebrowse-view/find-file-and-search-pattern): * progmodes/etags.el (find-tag-other-window): * progmodes/fortran.el (fortran-column-ruler): * progmodes/gdb-mi.el (gdb-mouse-toggle-breakpoint-fringe): * progmodes/verilog-mode.el (verilog-point-text): * reposition.el (reposition-window): * rot13.el (toggle-rot13-mode): * server.el (server-switch-buffer): * shell.el (shell-dynamic-complete-command) (shell-dynamic-complete-environment-variable): * simple.el (insert-buffer, set-selective-display) (delete-completion-window): * speedbar.el (speedbar-timer-fn, speedbar-center-buffer-smartly) (speedbar-recenter): * startup.el (fancy-splash-head): * textmodes/ispell.el (ispell-command-loop): * textmodes/makeinfo.el (makeinfo-compilation-sentinel-region): * tutorial.el (help-with-tutorial): * vc/add-log.el (add-change-log-entry): * vc/compare-w.el (compare-windows): * vc/ediff-help.el (ediff-indent-help-message): * vc/ediff-util.el (ediff-setup-control-buffer, ediff-position-region): * vc/ediff-wind.el (ediff-skip-unsuitable-frames) (ediff-setup-control-frame): * vc/emerge.el (emerge-position-region): * vc/pcvs-util.el (cvs-bury-buffer): * window.el (walk-windows, mouse-autoselect-window-select): * winner.el (winner-set-conf, winner-undo): Related users changed.
* Do not call to `selected-frame' where it is assumed by default.Dmitry Antipov2013-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | Affected functions are `raise-frame', `redraw-frame', `frame-first-window', `frame-terminal' and `delete-frame'. * lisp/calendar/appt.el (appt-disp-window): * lisp/epg.el (epg-wait-for-completion): * lisp/follow.el (follow-delete-other-windows-and-split) (follow-avoid-tail-recenter): * lisp/international/mule.el (set-terminal-coding-system): * lisp/mail/rmail.el (rmail-mail-return): * lisp/net/newst-plainview.el (newsticker--buffer-set-uptodate): * lisp/progmodes/f90.el (f90-add-imenu-menu): * lisp/progmodes/idlw-toolbar.el (idlwave-toolbar-toggle): * lisp/server.el (server-switch-buffer): * lisp/simple.el (delete-completion-window): * lisp/talk.el (talk): * lisp/term/xterm.el (terminal-init-xterm-modify-other-keys) (xterm-turn-on-modify-other-keys, xterm-remove-modify-other-keys): * lisp/vc/ediff-util.el (ediff-status-info, ediff-show-diff-output): * lisp/vc/ediff.el (ediff-documentation): Related users changed. * lisp/frame.el (selected-terminal): Remove the leftover.
* Silence ediff compilationGlenn Morris2013-05-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/ediff-diff.el, lisp/vc/ediff-merg.el: Require ediff-util at run-time. * lisp/vc/ediff-mult.el: Adjust requires. (ediff-directories-internal, ediff-directory-revisions-internal) (ediff-patch-file-internal): Declare. * lisp/vc/ediff-ptch.el: Adjust requires. (ediff-use-last-dir, ediff-buffers-internal): Declare. (ediff-find-file): Autoload. * lisp/vc/ediff-util.el: No need to load ediff when compiling. (ediff-regions-internal): Declare. * lisp/vc/ediff-wind.el: Adjust requires. (ediff-compute-toolbar-width): Define when compiling. (ediff-setup-control-buffer, ediff-make-bottom-toolbar): Declare. * lisp/vc/ediff.el: No need to load dired, ediff-ptch when compiling. (dired-get-filename, dired-get-marked-files) (ediff-last-dir-patch, ediff-patch-default-directory) (ediff-get-patch-buffer, ediff-dispatch-file-patching-job) (ediff-patch-buffer-internal): Declare.
* Add bug-gnu-emacs to some specialized bug report addressesGlenn Morris2013-02-231-1/+1
| | | | | | | | | | * emulation/viper-cmd.el (viper-submit-report): * progmodes/ps-mode.el (ps-mode-maintainer-address): * progmodes/vera-mode.el (vera-mode-help-address): * textmodes/artist.el (artist-maintainer-address): * textmodes/reftex.el (reftex-report-bug): * vc/ediff-util.el (ediff-submit-report): Add bug-gnu-emacs to bug report address.
* * vc/ediff-util.el (ediff-recenter): Use `select-frame-set-input-focus'Juri Linkov2013-02-131-1/+6
| | | | | | to select `ediff-control-frame' and set input focus correctly on Xfce. Fixes: debbugs:12218
* Add more keymaps where S-SPC scrolls in the opposite direction to SPC.Juri Linkov2013-02-131-0/+1
| | | | | | | | | | | * lisp/image-mode.el (image-mode-map): * lisp/doc-view.el (doc-view-mode-map): * lisp/vc/ediff-util.el (ediff-setup-keymap): Make S-SPC scroll in the opposite sense to SPC. * lisp/gnus/gnus-art.el (gnus-article-mode-map): * lisp/gnus/gnus-sum.el (gnus-summary-mode-map, gnus-summary-article-map): Make S-SPC scroll in the opposite sense to SPC. (Bug#2145)
* Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.caPaul Eggert2013-01-021-1/+1
|\
| * Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
| |
* | * lisp/vc/ediff-util.el (ediff-buffer-type): New function.Dave Abrahams2012-12-141-7/+15
|/ | | | | | | | (ediff-clone-buffer-for-current-diff-comparison): Compute the buf-type rather than taking it as as argument. (ediff-inferior-compare-regions): Adjust calls accordingly. Fixes: debbugs:11319
* * lisp/vc/ediff-util.el (ediff-diff-at-point): Don't assume point-min==1.Stefan Monnier2012-09-291-2/+2
|
* Standardize possessive apostrophe usage in manuals, docs, and commentsGlenn Morris2012-02-281-1/+1
| | | | Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* Spelling fixes.Paul Eggert2011-11-241-2/+2
|
* Spelling fixes.Paul Eggert2011-11-221-1/+1
|
* Fix typos.Juanma Barranquero2011-11-201-1/+1
|
* * vc/ediff-util.el (ediff-calc-command-time): Use time-sincePaul Eggert2011-06-301-9/+3
| | | | | and float-time. Say "NNN.NNN seconds" rather than "NNN seconds + NNN microseconds".
* Don't quote lambda expressions with `quote'.Stefan Monnier2011-05-231-1/+1
|
* Refill some long/short copyright headers.Glenn Morris2011-01-261-2/+1
|
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
|
* Use run-mode-hooks for major mode hooks.Stefan Monnier2011-01-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/textmodes/reftex-toc.el (reftex-toc-mode-map): Rename from reftex-toc-map. (reftex-toc-mode): Use define-derived-mode. * lisp/textmodes/reftex-sel.el (reftex-select-shared-map): New map. (reftex-select-label-mode-map, reftex-select-bib-mode-map): Rename from reftex-select-(label|bib)-map. Move init into declaration. (reftex-select-label-mode, reftex-select-bib-mode): Use define-derived-mode. * lisp/textmodes/reftex-index.el (reftex-index-phrases-mode-map) (reftex-index-mode-map): Rename from reftex-index(-phrases)-map. Move init into delcaration. (reftex-index-mode, reftex-index-phrases-mode): Use define-derived-mode. * lisp/speedbar.el (speedbar-mode-syntax-table): Renaqme from speedbar-syntax-table. Move init into declaration. (speedbar-mode-map): Rename from speedbar-key-map. Move init into declaration. (speedbar-file-key-map): Move init into declaration. (speedbar-mode): Use define-derived-mode. * lisp/recentf.el (recentf-mode): Don't run hook (or message) redundantly. * lisp/net/rcirc.el (rcirc-mode): Use run-mode-hooks. * lisp/emacs-lisp/chart.el (chart-mode-map): Rename from chart-map. (chart-face-list): Move initialization into declaration. (chart-mode): Use define-derived-mode. * lisp/calculator.el (calculator-mode-map): Move init into declaration. (calculator-mode): Use define-derived-mode. * lisp/cedet/srecode/srt-mode.el (srecode-template-mode): Use define-derived-mode. * lisp/cedet/semantic/symref/list.el (semantic-symref-results-mode): Use run-mode-hooks. * lisp/erc/erc.el (erc-mode): * lisp/erc/erc-dcc.el (erc-dcc-chat-mode): Use define-derived-mode. * lisp/org/org-remember.el (org-remember-mode): * lisp/org/org-capture.el (org-capture-mode): Don't run hook redundantly. Fixes: debbugs:513