summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff.el
Commit message (Collapse)AuthorAgeFilesLines
* Merge from origin/emacs-28Stefan Kangas2022-08-171-5/+5
|\ | | | | | | | | | | a4078fa628 ; * lisp/vc/ediff.el: Improve wording in last change. dd077ebded Revert "; * doc/lispintro/emacs-lisp-intro.texi: Fix typo." 362c9ab879 * doc/misc/gnus.texi (Article Washing): Fix Links URL.
| * ; * lisp/vc/ediff.el: Improve wording in last change.Stefan Kangas2022-08-161-5/+5
| |
* | Merge from origin/emacs-28Stefan Kangas2022-08-131-6/+5
|\| | | | | | | | | | | 72fc7258bf Delete references to deleted library hilit19.el e746fc2e7b Delete stale comments from Lisp Intro manual 77613b9217 ; Delete redundant installation instructions from ebnf2ps.el
| * Delete references to deleted library hilit19.elStefan Kangas2022-08-121-6/+5
| | | | | | | | | | | | | | * doc/misc/gnus.texi (Compatibility): * lisp/progmodes/f90.el: * lisp/ps-print.el: * lisp/vc/ediff.el: Delete references to hilit19.el.
* | Minor cleanups in ediff-*.elStefan Kangas2022-08-071-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/ediff-init.el (ediff-window-visible-p): (ediff-nonempty-string-p): Simplify. (stipple-pixmap): Don't try XEmacs specific(?) variable. (ediff-frame-unsplittable-p): Make obsolete. Update callers. (ediff-has-gutter-support-p): Redefine as obsolete function alias for 'ignore'. (ediff-mouse-event-p): Redefine as obsolete function alias for 'mouse-event-p'. Update callers. * lisp/vc/ediff-util.el (ediff-submit-report): Simplify. (ediff-filename-magic-p): Make obsolete. Update callers. (ediff-activate-mark): Make obsolete. Update callers. * lisp/vc/ediff-help.el: * lisp/vc/ediff-hook.el: * lisp/vc/ediff-util.el: * lisp/vc/ediff-wind.el: Remove superfluous defvars.
* | Merge from origin/emacs-28Eli Zaretskii2022-01-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year. 86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year ebe8772f65 ; Minor fixes related to copyright years 23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye... 8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t. 19dcb237b5 ; Add 2022 to copyright years. # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex # lib/cdefs.h # lisp/erc/erc-dcc.el # lisp/erc/erc-imenu.el # lisp/erc/erc-replace.el # lisp/image-dired.el # lisp/progmodes/xref.el # m4/alloca.m4 # m4/byteswap.m4 # m4/errno_h.m4 # m4/getopt.m4 # m4/gnulib-common.m4 # m4/inttypes.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/sys_socket_h.m4
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
| |
* | Use substitute-command-keys in some messagesStefan Kangas2021-11-171-1/+3
|/ | | | | | | | * lisp/dired.el (dired-get-file-for-visit): * lisp/doc-view.el (doc-view-buffer-message): * lisp/help.el (help-window-setup): * lisp/ibuf-ext.el (ibuffer-do-kill-lines): * lisp/vc/ediff.el (ediff-documentation): Use 'substitute-command-keys'.
* ; Fix typos in CONTRIBUTE, ELisp manual, ediffTom Levy2021-11-101-2/+2
| | | | | | | | | * CONTRIBUTE: Remove stray '. after git command. * doc/lispref/functions.texi (Function Cells): Fix typo. * lisp/vc/ediff.el (ediff-regions-wordwise): Fix typo in prompts ("Region's A buffer" => "Region A's buffer") (bug#51718). Copyright-paperwork-exempt: yes
* ; Fix some recent fixes to doc stringsEli Zaretskii2021-09-261-2/+1
| | | | | | | | | | | | | | | | * lisp/whitespace.el (whitespace-empty-at-bob-regexp): * lisp/vc/vc-dir.el (vc-dir-child-files-and-states): * lisp/vc/vc-annotate.el (vc-annotate-show-changeset-diff-revision-at-line): * lisp/vc/ediff.el (ediff-merge-with-ancestor-command): * lisp/gnus/nnvirtual.el (nnvirtual-update-xref-header) (nnvirtual-map-article): * lisp/emulation/viper-init.el (viper-ESC-keyseq-timeout): * lisp/emulation/viper-cmd.el (viper-set-parsing-style-toggling-macro): * lisp/cedet/data-debug.el (data-debug-insert-hash-table-button): "The first line of a doc string must be a complete sentence." Also, fix some awkward wording in doc strings while at that.
* ; Adjust overly long docstrings to fit 80 charactersStefan Kangas2021-09-261-4/+6
|
* ; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas2021-09-181-6/+9
|
* ; More minor docfixes found by checkdocStefan Kangas2021-09-141-1/+1
|
* lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier2021-02-261-26/+26
| | | | | | | | | | | | | | | | | | | | | | Also remove some redundant `:group` arguments. * lisp/vc/vc.el (vc-ignore): Autoload. * lisp/vc/pcvs-util.el (cvs-every, cvs-union, cvs-map): Delete functions. * lisp/vc/cvs-status.el: Require `cl-lib` at runtime. (cvs-tree-tags-insert): Use `cl-mapcar` and `cl-every` instead. * lisp/vc/pcvs.el: Require `cl-lib` at runtime. (cvs-do-removal): Use `cl-every` instead. * lisp/vc/ediff-init.el: Require `ediff-util` (for `ediff-cleanup-mess` and `ediff-default-suspend-function`). * lisp/vc/pcvs-info.el (cvs-fileinfo<): Remove unused vars `subtypea` and `subtypeb`. * lisp/vc/vc-git.el: * lisp/vc/vc-bzr.el: Require `vc-dispatcher` at runtime for `vc-do-async-command`.
* Make libraries works with xterm-mouse-mode.Jared Finder2021-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change calls from 'read-event' to 'read-key' in libraries expecting mouse events. Do this only when 'xterm-mouse-mode' is enabled. That way those libraries read decoded mouse events instead of the underlying escape sequence. Add a parameter to 'read-key' that avoids running any of the unbound fallbacks in 'read-key-sequence' so the libraries can read mouse button-down events. For backward compatibility purposes, the above logic is contained in a new internal-only function: 'read--potential-mouse-event'. * doc/lispref/commands.texi (Reading One Event): Document new parameter to 'read-key'. Mention that non-character events on terminals need 'read-key'. * lisp/subr.el (read-key-full-map): Add new keymap used by 'read-key'. (read-key): Add new parameter 'fallbacks-disabled' to prevent running any of the unbound fallbacks normally run by 'read-key-sequence'. (read--potential-mouse-event): Add new function that calls 'read-key' or 'read-event' depending on if 'xterm-mouse-mode' is set. * lisp/foldout.el (foldout-mouse-swallow-events): * lisp/isearch.el (isearch-pre-command-hook): * lisp/mouse-drag.el (mouse-drag-throw, mouse-drag-drag): * lisp/mouse.el (mouse-drag-secondary): * lisp/ruler-mode.el (ruler-mode-mouse-grab-any-column) (ruler-mode-mouse-drag-any-column-iteration): * lisp/strokes.el (strokes-read-stroke, strokes-read-complex-stroke): * lisp/textmodes/artist.el (artist-mouse-draw-continously) (artist-mouse-draw-poly, artist-mouse-draw-2points): * lisp/vc/ediff-wind.el (ediff-get-window-by-clicking): * lisp/wid-edit.el (widget-button--check-and-call-button) (widget-button-click): Call 'read--potential-mouse-event' instead of 'read-event'. * lisp/wid-edit.el (widget-key-sequence-read-event): Call 'read-key' with 'fallbacks-disabled' set instead of 'read-event'. Unlike above changes, this is unconditionally applied so it works for function keys too. Apply 'local-function-key-map' instead of 'function-key-map' as that contains the full terminal translations. * lisp/vc/ediff.el (ediff-windows): Use 'display-mouse-p' to check if a mouse is available. * src/lread.c (Fread_event): Recommend 'read-key' in docstring for 'read-event' for non-character events.
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
| | | | Run "TZ=UTC0 admin/update-copyright".
* Use `format-prompt' when prompting with default valuesLars Ingebrigtsen2020-09-061-54/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/woman.el (woman-file-name): * lisp/wid-edit.el (widget-file-prompt-value) (widget-coding-system-prompt-value): * lisp/w32-fns.el (w32-set-system-coding-system): * lisp/vc/vc.el (vc-print-root-log): * lisp/vc/vc-annotate.el (vc-annotate): * lisp/vc/emerge.el (emerge-read-file-name): * lisp/vc/ediff.el (ediff-directories) (ediff-directory-revisions, ediff-directories3) (ediff-merge-directories, ) (ediff-merge-directories-with-ancestor) (ediff-merge-directory-revisions) (ediff-merge-directory-revisions-with-ancestor) (ediff-merge-revisions, ediff-merge-revisions-with-ancestor) (ediff-revision): * lisp/vc/ediff-util.el (ediff-toggle-regexp-match): * lisp/vc/ediff-mult.el (ediff-filegroup-action): * lisp/vc/add-log.el (prompt-for-change-log-name): * lisp/textmodes/table.el (table-insert-row-column) (table-span-cell, table-split-cell-horizontally) (table-split-cell, table-justify, table-generate-source) (table-insert-sequence, table-capture) (table--read-from-minibuffer, table--query-justification): * lisp/textmodes/sgml-mode.el (sgml-tag, sgml-tag-help): * lisp/textmodes/reftex-ref.el (reftex-goto-label): * lisp/textmodes/refer.el (refer-get-bib-files): * lisp/textmodes/css-mode.el (css-lookup-symbol): * lisp/term.el (serial-read-name, serial-read-speed): * lisp/speedbar.el (speedbar-change-initial-expansion-list): * lisp/simple.el (previous-matching-history-element) (set-variable): * lisp/ses.el (ses-read-cell, ses-set-column-width): * lisp/replace.el (query-replace-read-from) (occur-read-primary-args): * lisp/rect.el (string-rectangle, string-insert-rectangle): * lisp/progmodes/tcl.el (tcl-help-on-word): * lisp/progmodes/sh-script.el (sh-set-shell): * lisp/progmodes/python.el (python-eldoc-at-point): * lisp/progmodes/octave.el (octave-completing-read) (octave-update-function-file-comment, octave-insert-defun): * lisp/progmodes/inf-lisp.el (lisp-symprompt): * lisp/progmodes/cperl-mode.el (cperl-info-on-command) (cperl-perldoc): * lisp/progmodes/compile.el (compilation-find-file): * lisp/net/rcirc.el (rcirc-prompt-for-encryption): * lisp/net/eww.el (eww): * lisp/net/browse-url.el (browse-url-with-browser-kind): * lisp/man.el (man): * lisp/mail/sendmail.el (sendmail-query-user-about-smtp): * lisp/mail/mailalias.el (build-mail-aliases): * lisp/mail/mailabbrev.el (merge-mail-abbrevs) (rebuild-mail-abbrevs): * lisp/locate.el (locate-prompt-for-search-string): * lisp/isearch.el (isearch-occur): * lisp/international/ogonek.el (ogonek-read-encoding) (ogonek-read-prefix): * lisp/international/mule.el (read-buffer-file-coding-system) (set-terminal-coding-system, set-keyboard-coding-system) (set-next-selection-coding-system, recode-region): * lisp/international/mule-cmds.el () (universal-coding-system-argument, search-unencodable-char) (select-safe-coding-system-interactively): * lisp/info.el (Info-search, Info-search-backward, Info-menu): * lisp/info-look.el (info-lookup-interactive-arguments): * lisp/imenu.el (imenu--completion-buffer): * lisp/ibuf-ext.el (mode, used-mode, ibuffer-mark-by-mode): * lisp/hi-lock.el (hi-lock-unface-buffer) (hi-lock-read-face-name): * lisp/help.el (view-emacs-news, where-is): * lisp/help-fns.el (describe-variable, describe-symbol) (describe-keymap): * lisp/gnus/mm-decode.el (mm-save-part): * lisp/gnus/gnus-sum.el (gnus-summary-browse-url): * lisp/gnus/gnus-group.el (gnus-group--read-bug-ids) (gnus-group-set-current-level): * lisp/frame.el (make-frame-on-monitor) (close-display-connection, select-frame-by-name): * lisp/format.el (format-encode-buffer, format-encode-region): * lisp/files.el (recode-file-name): * lisp/files-x.el (read-file-local-variable) (read-file-local-variable-value, ) (read-file-local-variable-mode): * lisp/ffap.el (ffap-menu-ask): * lisp/faces.el (face-read-string): * lisp/facemenu.el (facemenu-set-charset): * lisp/erc/erc-dcc.el (erc-dcc-do-GET-command): * lisp/emulation/edt-mapper.el (edt-mapper): * lisp/emacs-lisp/trace.el (trace--read-args) (trace-function-foreground, trace-function-background): * lisp/emacs-lisp/smie.el (smie-config-set-indent): * lisp/emacs-lisp/re-builder.el (reb-change-syntax): * lisp/emacs-lisp/package.el (describe-package): * lisp/emacs-lisp/find-func.el (read-library-name) (find-function-read): * lisp/emacs-lisp/ert.el (ert-read-test-name) (ert-run-tests-interactively): * lisp/emacs-lisp/disass.el (disassemble): * lisp/emacs-lisp/debug.el (debug-on-entry) (debug-on-variable-change): * lisp/emacs-lisp/advice.el (ad-read-advised-function) (ad-read-advice-class, ad-read-advice-name, ad-read-regexp): * lisp/dired-x.el (dired--mark-suffix-interactive-spec): * lisp/dired-aux.el (dired-diff): * lisp/cus-edit.el (custom-variable-prompt, customize-mode) (customize-changed-options): * lisp/completion.el (interactive-completion-string-reader): * lisp/calendar/timeclock.el (timeclock-ask-for-project): * lisp/calc/calcalg3.el (calc-get-fit-variables): * lisp/calc/calc-store.el (calc-edit-variable): * lisp/calc/calc-bin.el (calc-word-size): * lisp/bookmark.el (bookmark-set-internal): * lisp/abbrev.el (read-abbrev-file): Use `format-prompt' for prompting (bug#12443).
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
| | | | Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
* Remove obsolete doc references to XEmacs (Bug#37899)Stefan Kangas2019-10-281-2/+1
| | | | | | | | | | | | | | | | | * doc/misc/edt.texi (Changes, Goals): * doc/misc/emacs-mime.texi (Charset Translation): * doc/misc/gnus-faq.texi (FAQ 4-15): * doc/misc/pcl-cvs.texi (Bugs): * doc/misc/srecode.texi (SRecode Minor Mode): * lisp/cedet/srecode/insert.el (srecode-insert-ask-variable-method): * lisp/follow.el: * lisp/leim/quail/ipa.el (ipa-x-sampa, ipa-kirshenbaum): * lisp/net/newsticker.el: * lisp/obsolete/iswitchb.el: * lisp/progmodes/hideshow.el: * lisp/savehist.el (savehist-file): * lisp/vc/ediff.el: Remove obsolete references to XEmacs in doc strings and comments.
* Remove most of the XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-051-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code and declare compatibility functions for obsolete. Adjust all callers. * lisp/vc/ediff-help.el (ediff-set-help-overlays): * lisp/vc/ediff-hook.el: (menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu) (menu-bar-ediff-menu, menu-bar-ediff-merge-menu) (menu-bar-epatch-menu, menu-bar-ediff-misc-menu): * lisp/vc/ediff-init.el (ediff-device-type) (ediff-window-display-p, ediff-has-face-support-p) (ediff-has-toolbar-support-p, ediff-has-gutter-support-p) (ediff-BAD-INFO, ediff-coding-system-for-write) (ediff-read-event, ediff-overlayp, ediff-make-overlay) (ediff-delete-overlay, ediff-color-display-p) (ediff-display-pixel-width, ediff-display-pixel-height) (ediff-region-help-echo, ediff-set-face-pixmap) (ediff-paint-background-regions-in-one-buffer) (ediff-clear-fine-diff-vector, ediff-mouse-event-p) (ediff-key-press-event-p, ediff-event-point, ) (ediff-event-buffer, ediff-event-key, ediff-last-command-char) (ediff-frame-iconified-p, ediff-frame-char-width) (ediff-reset-mouse, ediff-frame-char-height) (ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer) (ediff-overlay-get, ediff-move-overlay, ediff-overlay-put) (ediff-abbreviate-file-name): * lisp/vc/ediff-mult.el (ediff-next-meta-item) (ediff-previous-meta-item) (ediff-replace-session-activity-marker-in-meta-buffer) (ediff-replace-session-status-in-meta-buffer) (ediff-redraw-directory-group-buffer) (ediff-update-markers-in-dir-meta-buffer) (ediff-update-session-marker-in-dir-meta-buffer) (ediff-redraw-registry-buffer, ediff-set-meta-overlay) (ediff-update-meta-buffer, ediff-get-meta-info) (ediff-get-meta-overlay-at-pos, ) (ediff-get-session-number-at-pos, ) (ediff-next-meta-overlay-start) (ediff-previous-meta-overlay-start, ) (ediff-meta-mark-equal-files): * lisp/vc/ediff-util.el: (ediff-setup, ediff-setup-control-buffer, ediff-recenter) (ediff-recenter-one-window, ediff-toggle-read-only) (ediff-file-checked-out-p, ediff-file-checked-in-p) (ediff-toggle-wide-display, ediff-toggle-multiframe) (ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar) (ediff-visible-region, ediff-scroll-vertically) (ediff-scroll-horizontally, ediff-jump-to-difference-at-point) (ediff-diff-to-diff, ediff-restore-diff) (ediff-toggle-regexp-match, ediff-really-quit) (ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer) (ediff-unhighlight-diffs-totally-in-one-buffer) (ediff-save-buffer, ediff-make-cloned-buffer) (ediff-make-indirect-buffer, ediff-remove-flags-from-buffer) (ediff-place-flags-in-buffer1, ediff-get-diff-posn) (ediff-clear-diff-vector, ediff-make-bullet-proof-overlay) (ediff-submit-report, ediff-deactivate-mark) (ediff-activate-mark, ediff-profile, ediff-print-diff-vector): * lisp/vc/ediff-wind.el (ediff-control-frame-parameters) (ediff-get-window-by-clicking, ediff-select-lowest-window) (ediff-setup-windows-plain-merge) (ediff-setup-windows-plain-compare, ediff-setup-control-frame) (ediff-destroy-control-frame, ediff-make-frame-position) (ediff-make-wide-display, ediff-get-visible-buffer-window): * lisp/vc/ediff.el (ediff-version, ediff-documentation):
* * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier2019-06-211-104/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable lexical-binding in ediff. For that, change ediff-find-file so as not to rely on dynamic scoping in its calling convention. * lisp/vc/ediff-diff.el: Move `provide` to the end. Remove redundant :group. (ediff-exec-process): Disregard current directory. (ediff-forward-word-function): Use defvar-local. * lisp/vc/ediff-help.el (ediff-set-help-message): Use functionp. * lisp/vc/ediff-hook.el (menu-bar-ediff-misc-menu): Make a toggle, as in the XEmacs menu. * lisp/vc/ediff-init.el (ediff-defvar-local): Add `doc-string` prop. (ediff-check-version): Delete function, unused. * lisp/vc/ediff-mult.el: Move `provide` to the end. Remove redundant :groups. (ediff-dir-diffs-buffer-map): Move initialization into declaration. (ediff-meta-mode): Use define-derived-mode. (ediff-intersect-directories): Remove `comparison-func`, unused. (ediff-prepare-meta-buffer): Fix use of `startup-hooks`. * lisp/vc/ediff-ptch.el: Move `provide` to the end. * lisp/vc/ediff-util.el (ediff-add-to-history): Use add-to-history instead. * lisp/vc/ediff-vers.el (ediff-vc-internal, ediff-vc-merge-internal): Use push and closures. * lisp/vc/ediff-wind.el: Remove redundant :groups. * lisp/vc/ediff.el: Move `provide` to the end. Remove redundant :groups. (ediff--magic-file-name, ediff--startup-hook): New vars. (ediff-find-file): Change calling convention so as not to use symbols as value cells. (ediff--buffer-file-name): New function. (ediff-files-internal): Adjust to new calling convention of ediff-find-file. (ediff-directories-internal, ediff-directory-revisions-internal) (ediff-regions-internal): Use push and closures.
* Disable lexical-binding in ediffGlenn Morris2019-06-181-1/+1
| | | | | | | | Since it breaks the thing (bug#36157, bug#36281). * lisp/vc/ediff-diff.el, lisp/vc/ediff-help.el, lisp/vc/ediff-hook.el: * lisp/vc/ediff-init.el, lisp/vc/ediff-merg.el, lisp/vc/ediff-mult.el: * lisp/vc/ediff-ptch.el, lisp/vc/ediff-vers.el, lisp/vc/ediff-wind.el: * lisp/vc/ediff.el: Set lexical-binding to nil.
* Use lexical binding for ediffAlex Branham2019-06-091-7/+4
| | | | | | | | | | | | | | | * lisp/vc/ediff-diff.el: * lisp/vc/ediff-help.el: * lisp/vc/ediff-hook.el: * lisp/vc/ediff-init.el: * lisp/vc/ediff-merg.el: * lisp/vc/ediff-vers.el: * lisp/vc/ediff-wind.el: * lisp/vc/ediff-mult.el: * lisp/vc/ediff-ptch.el: * lisp/vc/ediff.el: Use lexical binding. (ediff-version): Increase. (ediff-date): Remove.
* Merge from origin/emacs-26Paul Eggert2018-12-311-1/+1
|\ | | | | | | | | | | 2fcf2df Fix copyright years by hand 26bed8b Update copyright year to 2019 2814292 Fix value of default frame height. (Bug#33921)
| * Update copyright year to 2019Paul Eggert2019-01-011-1/+1
| | | | | | | | Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
* | Merge from origin/emacs-26Glenn Morris2018-11-281-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | 74a3a79 (origin/emacs-26) Fix a typo in a doc string 911766d Minor markup fix in frames.texi 19ed1e9 * lisp/net/trampver.el (customize-package-emacs-version-alist... d7132ad * lisp/mh-e/mh-e.el (customize-package-emacs-version-alist): ... 5f39260 * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Pass format to m... a291f62 Don't call xwidget functions until GTK has been initialized f0531b8 Improve documentation of Ediff wordwise commands 2925ce5 Support Hunspell 1.7.0 in ispell.el 03bb7a8 Avoid clearing echo-area message by auto-save-visited-file-name
| * Improve documentation of Ediff wordwise commandsEli Zaretskii2018-11-271-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/ediff.el (ediff-windows-wordwise) (ediff-windows-linewise, ediff-regions-wordwise): Update and clarify the doc strings. * doc/misc/ediff.texi (Major Entry Points): Update and clarify the documentation of 'ediff-windows-wordwise' and 'ediff-regions-wordwise'. See the discussion starting at https://lists.gnu.org/archive/html/help-gnu-emacs/2018-11/msg00197.html for the details.
* | Remove some declare-function stub definitionsGlenn Morris2018-03-231-4/+0
| | | | | | | | | | | | | | | | | | | | | | * lisp/emulation/viper-cmd.el, lisp/emulation/viper-keym.el: * lisp/emulation/viper-util.el, lisp/net/newst-plainview.el: * lisp/net/newst-treeview.el, lisp/ps-def.el, lisp/vc/ediff.el: * lisp/vc/ediff-util.el, lisp/vc/ediff-wind.el: Remove stub declare-function definitions. It exists since Emacs 22.2, released 10 years ago. Most of these files are using even newer features, such as lexical-binding and cl-lib anyway, making the stubs pointless.
* | Update some lisp function declarationsGlenn Morris2018-02-261-1/+1
|/
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
| | | | Run admin/update-copyright.
* Ediff: add some missing documentationPhilipp Stephani2017-11-051-25/+100
| | | | | | | | | | | | | | | | | | | | * vc/ediff.el (ediff-files, ediff-files3, ediff-buffers) (ediff-buffers3, ediff-merge-directories) (ediff-merge-directories-with-ancestor) (ediff-merge-directory-revisions) (ediff-merge-directory-revisions-with-ancestor) (ediff-windows-wordwise, ediff-windows-linewise) (ediff-regions-wordwise, ediff-regions-linewise) (ediff-merge-files, ediff-merge-files-with-ancestor) (ediff-merge-buffers, ediff-merge-buffers-with-ancestor) (ediff-merge-revisions, ediff-merge-revisions-with-ancestor) (ediff-patch-file, ediff-revision): Document missing arguments. (ediff-patch-buffer, ediff-revision): Add second space after period. (ediff-files-command, ediff3-files-command, ediff-merge-command) (ediff-merge-with-ancestor-command, ediff-directories-command) (ediff-directories3-command, ediff-merge-directories-command): Add documentation for the command line functions.
* 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-67/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* 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.
* | Clarify ediff-directories promptDima Kogan2016-11-231-14/+14
| | | | | | | | | | | | | | | | | | | | * lisp/vc/ediff-mult.el (ediff-filegroup-action): * lisp/vc/ediff.el (ediff-directories,ediff-directory-revisions, ediff-directories3, ediff-merge-directories, ediff-merge-directories-with-ancestor, ediff-merge-directory-revisions, ediff-merge-directory-revisions-with-ancestor): Clarify prompt message for filename filter in interactive ediff. The new message makes it clear what is being filtered
* | Don't bug out on nil `patch-buf' argumentsLars Magne Ingebrigtsen2016-03-201-2/+2
| | | | | | | | | | * lisp/vc/ediff.el (ediff-patch-file): Don't bug out on nil `patch-buf' arguments.
* | Require that the buffer that we're trying to patch existLars Ingebrigtsen2016-02-231-1/+2
| | | | | | | | | | * lisp/vc/ediff.el (ediff-patch-buffer): Require that the buffer that we're trying to patch exist (bug#21852).
* | Require that the buffer that we're trying to patch existTino Calancha2016-02-231-3/+2
|/ | | | | | | * lisp/vc/ediff.el (ediff-patch-buffer): Require that the buffer that we're trying to patch exist (bug#21852). Copyright-paperwork-exempt: yes
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
| | | | Run admin/update-copyright.
* Backslash cleanup in Elisp source filesPaul Eggert2015-09-171-2/+2
| | | | | | | | | | | 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-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
| | | | Run admin/update-copyright.
* Doc and comment fixes re "online" helpGlenn Morris2014-06-281-1/+1
| | | | | | | | | | | | | | | | | | | * doc/emacs/help.texi (Misc Help): * doc/emacs/trouble.texi (Checklist): * doc/lispintro/emacs-lisp-intro.texi (Note for Novices, Finding More) (Conclusion): * doc/lispref/help.texi (Help Functions): * doc/misc/info.texi, doc/misc/mh-e.texi: * etc/refcards/calccard.tex (section{Getting Help}): * lisp/cus-edit.el (help): * lisp/finder.el (finder-known-keywords): * lisp/help.el (help-for-help-internal): * lisp/vc/ediff-mult.el (ediff-meta-buffer-verbose-message) (ediff-redraw-registry-buffer): * lisp/vc/ediff-ptch.el (ediff-patch-file-internal): Doc fixes re "online" help. Fixes: debbugs:17803
* Small codes update for revert-buffer-function no longer being nil by defaultGlenn Morris2014-04-021-2/+4
| | | | | | * lisp/menu-bar.el (menu-bar-file-menu): * lisp/vc/ediff.el (ediff-current-file): Update for revert-buffer-function no longer being nil by default.
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
|
* Update some function declarationsGlenn Morris2013-09-111-1/+1
| | | | | | * calc/calc-help.el (Info-goto-node): * progmodes/cperl-mode.el (Info-find-node): * vc/ediff.el (Info-goto-node): Update declarations.
* * lisp/dired-x.el:Daniel Hackney2013-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | * 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-frame' where it is assumed by default.Dmitry Antipov2013-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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.
* * faces.el (tty-run-terminal-initialization): function changed (StefanMichael Kifer2013-07-071-2/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Monnier's patch). * viper.el (viper-emacs-state-mode-list): add egg-status-buffer-mode. (viper-version): version update. (viper-go-away,viper-setup-hooks): function changed (Stefan Monnier's patch). (viper--lookup-key,viper-catch-tty-ESC,viper-uncatch-tty-ESC, viper-setup-ESC-to-escape): new functions (Stefan Monnier's patch). * viper-cmd.el: (viper-del-forward-char-in-insert): new function. (viper-save-kill-buffer): check if buffer is modified. (viper-envelop-ESC-key): function deleted (Stefan Monnier's patch). (viper-intercept-ESC-key): function changed (Stefan Monnier's patch). * viper-keym.el (viper-ESC-key): constant changed (Stefan Monnier's patch). * ediff.el (ediff-files-command,ediff3-files-command): new functions. (ediff-merge-command,ediff-merge-with-ancestor-command): new functions. (ediff-directories-command,ediff-directories3-command): new functions. (ediff-merge-directories-command): new function. (ediff-merge-directories-with-ancestor-command): new function. All the above are command-line interfaces to ediff: facilitate calling Emacs with the appropriate ediff functions invoked. (ediff-version): version update.
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-14 19:37:54 +0000