summaryrefslogtreecommitdiff
path: root/lisp/vc
Commit message (Collapse)AuthorAgeFilesLines
* * lisp/vc/emerge.el: Use lexical-bindingStefan Monnier2018-04-031-352/+250
| | | | | | | | | | | | | | Replace all `(lambda ...) with closures. Use inhibit-read-only. (emerge-mode): Use define-minor-mode. (emerge-setup, emerge-setup-with-ancestor): Don't use 'run-hooks' on local var. (emerge-files, emerge-files-with-ancestor): Don't use 'add-hook' on local var. (emerge-convert-diffs-to-markers): Remove unused var 'B-point-min'. Simplify 'offset'. (emerge--current-beg, emerge--current-end): New macros. (emerge-select-version): Pass 'diff-vector' to the function it calls. Change all callers to use it instead of dyn-bound vars.
* Prefer \... to control chars in .el literalsPaul Eggert2018-03-291-1/+1
|
* Merge from origin/emacs-26Glenn Morris2018-03-282-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9bff405 (origin/emacs-26) * doc/misc/org.texi (Installation): Fix clo... 613c9a5 Update Org to v9.1.9 1b075a9 ; Fix some tiny doc typos 441fe20 De-obsolete `if-let' and `when-let' 8696038 * lisp/htmlfontify.el (hfy-begin-span-handler): Doc fix. 930f7b1 * doc/lispref/functions.texi (Defining Functions): Improve in... 95ccf50 Fix crash after frame is freed on macOS (bug#30800) 45d0475 More manual editing 2acb9f0 Minor manual changes changes d481cba * lisp/calculator.el (calculator-paste-decimals): Add version. 7d6c7d0 ; Use GNU not Gnu in docs 1bc4def More proofreading of the Emacs manual Conflicts: doc/misc/org.texi etc/NEWS lisp/org/org-clock.el
| * ; Use GNU not Gnu in docsGlenn Morris2018-03-232-2/+2
| |
* | * lisp/vc/vc.el (vc-initial-comment): Remove var unused since 23.2.Glenn Morris2018-03-231-7/+0
| |
* | Remove some declare-function stub definitionsGlenn Morris2018-03-233-11/+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.
* | Fix too-large integer in Hg backendPaul Eggert2018-03-231-2/+2
| | | | | | | | | | * lisp/vc/vc-hg.el (vc-hg-state-fast): Don’t assume that 2**32 - 1 is representable as a fixnum.
* | Quieten cl-lib related compiler warningsGlenn Morris2018-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/completion.el (cl-set-difference): * lisp/files.el (map-merge-with, map-merge): * lisp/emacs-lisp/radix-tree.el (map-apply): Declare. * lisp/emacs-lisp/thunk.el: Load cl-lib at run-time, not cl-macs at compile. * lisp/gnus/gnus-group.el: Load cl-lib at run-time, not cl at compile. * lisp/emacs-lisp/checkdoc.el, lisp/emacs-lisp/package.el * lisp/gnus/gnus-sum.el, lisp/gnus/message.el, lisp/net/shr.el: Load cl-lib at run-time. * lisp/gnus/mml-sec.el (mml-signencrypt-style) (mml-secure-cust-record-keys): Replace cl with cl-lib, and load it at run-time. * lisp/cedet/ede/linux.el, lisp/vc/vc-hg.el: Reorder requires.
* | Add new command vc-git-stash-deleteCharles A. Roelli2018-03-221-0/+9
| | | | | | | | | | | | * lisp/vc/vc-git.el (vc-git-stash-delete): New command, in line with vc-git-stash-delete-at-point. (vc-git-extra-menu-map): Add menu entry.
* | Provide completion in vc-git-stash-* commandsCharles A. Roelli2018-03-211-3/+18
| | | | | | | | | | | | | | * lisp/vc/vc-git.el (vc-git-stash-read-history) (vc-git-stash-read): New history variable and function. (vc-git-stash-show, vc-git-stash-apply, vc-git-stash-pop): Update their interactive specifications.
* | Explicitly require cl-lib where neededGlenn Morris2018-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than relying on the byte-compiler happening to use it. * lisp/completion.el, lisp/ffap.el, lisp/loadhist.el: * lisp/userlock.el, lisp/emacs-lisp/debug.el, lisp/emacs-lisp/rx.el: * lisp/emacs-lisp/testcover.el, lisp/mail/rfc2231.el: * lisp/net/newst-treeview.el, lisp/net/puny.el: * lisp/net/tramp-archive.el, lisp/net/tramp-gvfs.el: * lisp/net/tramp-sh.el, lisp/net/tramp-smb.el, lisp/org/org-ctags.el: * lisp/org/org-macs.el, lisp/progmodes/grep.el: * lisp/progmodes/perl-mode.el, lisp/progmodes/ruby-mode.el: * lisp/textmodes/dns-mode.el, lisp/textmodes/mhtml-mode.el: * lisp/vc/pcvs-parse.el: Explicitly require cl-lib as needed.
* | Merge from origin/emacs-26Glenn Morris2018-03-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 675edec (origin/emacs-26) Fix some allout.el aliases b2c069a * lisp/progmodes/ada-mode.el (ada-clean-buffer-before-saving)... 2f5420c Doc fixes re obsolete items 9edf82a Replace an obsolete alias in tpu-mapper a643792 Doc fixes re obsolete items 3060fb8 Minor changes in mule.texi 3e39897 Avoid assertion violation under visual-order-cursor-movement e4b73ab Stop mentioning options.el in doc 05669f0 ; * lisp/minibuffer.el (completion-cycle-threshold): Fix last... 758597f * lisp/vc/vc-dir.el (vc-dir-unmark): Fix documentation. 62f0a2b * lisp/minibuffer.el (completion-cycle-threshold): Doc fix. 761845c Fix last change in Xref documentation 5186675 More changes in the Emacs manual b1aaa72 Improve documentation of Xref Conflicts: lisp/w32-fns.el
| * * lisp/vc/vc-dir.el (vc-dir-unmark): Fix documentation.Charles A. Roelli2018-03-121-1/+1
| |
* | * lisp/subr.el (focus-frame, unfocus-frame): Remove obsolete no-ops.Glenn Morris2018-03-121-2/+2
| | | | | | | | | | | | | | | | | | * lisp/vc/ediff-util.el (ediff-recenter): Don't try focus-frame on Emacs. ; * etc/NEWS: Mention this. ; Comments in subr.el mention VM as a user, however this is untrue since ; 2010-07. Ref https://bazaar.launchpad.net/~vm/vm/trunk/revision/840 ; and 853.
* | Remove many items obsolete since Emacs 22.1Glenn Morris2018-03-103-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emacs 22.1 was five major releases and over decade ago. In bug reporting statistics, it's been absent for around 5 years. Ref: https://debbugs.gnu.org/stats/emacs.html This list can be reviewed before to the next release, but for now hopefully this motivates any needed external updates. * lisp/arc-mode.el (archive-mouse-extract): * lisp/bookmark.el (bookmark-exit-hooks): * lisp/comint.el (comint-use-prompt-regexp-instead-of-fields): * lisp/cus-edit.el (custom-face-save-command): * lisp/descr-text.el (describe-char-after): * lisp/desktop.el (desktop-enable, desktop-basefilename) (desktop-buffer-modes-to-save, desktop-buffer-misc-functions) (desktop-buffer-handlers, desktop-load-default): * lisp/dired-x.el (dired-omit-files-p): * lisp/frame.el (new-frame, set-default-font, delete-frame-hook) (blink-cursor): * lisp/generic-x.el (generic-define-mswindows-modes) (generic-define-unix-modes): * lisp/help.el (describe-project, view-todo): * lisp/hilit-chg.el (highlight-changes-colours): * lisp/ibuffer.el (ibuffer-elide-long-columns, ibuffer-hooks) (ibuffer-mode-hooks): * lisp/imenu.el (imenu-always-use-completion-buffer-p): * lisp/isearch.el (isearch-lazy-highlight-cleanup) (isearch-lazy-highlight-initial-delay) (isearch-lazy-highlight-interval) (isearch-lazy-highlight-max-at-a-time) (isearch-lazy-highlight-cleanup): * lisp/mwheel.el (mouse-wheel-down-button) (mouse-wheel-up-button, mouse-wheel-click-button): * lisp/novice.el (disabled-command-hook): * lisp/recentf.el (recentf-menu-append-commands-p): * lisp/savehist.el (savehist-load): * lisp/speedbar.el (speedbar-ignored-path-expressions) (speedbar-ignored-path-regexp, speedbar-add-ignored-path-regexp) (speedbar-line-path, speedbar-buffers-line-path, speedbar-path-line): * lisp/subr.el (assoc-ignore-case, assoc-ignore-representation) (x-lost-selection-hooks, x-sent-selection-hooks) (process-kill-without-query): * lisp/calendar/icalendar.el (icalendar-convert-diary-to-ical) (icalendar-extract-ical-from-buffer): * lisp/emacs-lisp/autoload.el (update-autoloads-from-directories): * lisp/emacs-lisp/derived.el (derived-mode-class): * lisp/emacs-lisp/generic.el (generic-font-lock-defaults): * lisp/emacs-lisp/timer.el (timer-set-time-with-usecs): * lisp/gnus/spam.el (spam-list-of-processors): * lisp/international/latin1-disp.el (latin1-char-displayable-p): * lisp/mail/rmail.el (rmail-pop-password, rmail-pop-password-required): * lisp/net/goto-addr.el (goto-address-at-mouse): * lisp/net/net-utils.el (ipconfig-program, ipconfig-program-options): * lisp/obsolete/iswitchb.el (iswitchb-use-fonts): * lisp/play/dunnet.el (dungeon-mode-map): * lisp/progmodes/compile.el (compilation-finish-function) * lisp/progmodes/cperl-mode.el (cperl-vc-header-alist) * lisp/progmodes/gud.el (tooltip-gud-modes, tooltip-gud-display) (tooltip-gud-toggle-dereference): * lisp/progmodes/pascal.el (pascal-outline): * lisp/progmodes/perl-mode.el (electric-perl-terminator): * lisp/textmodes/nroff-mode.el (count-text-lines) (forward-text-line, backward-text-line, electric-nroff-newline) (electric-nroff-mode): * lisp/vc/log-edit.el (vc-comment-ring, vc-comment-ring-index) (vc-previous-comment, vc-next-comment) (vc-comment-search-reverse, vc-comment-search-forward) (vc-comment-to-change-log): * lisp/vc/pcvs-info.el (cvs-display-full-path) (cvs-fileinfo->full-path): * lisp/vc/vc.el (vc-diff-switches-list): Remove items, obsolete since Emacs 22.1. * lisp/ibuffer.el (ibuffer-cached-elide-long-columns): Remove internal variable. (ibuffer-compile-make-eliding-form, ibuffer-check-formats): (ibuffer-mode): Remove support for ibuffer-elide-long-columns. * lisp/cedet/semantic/sb.el (semantic-sb-token-jump): Remove support for speedbar-line-path. * lisp/emacs-lisp/unsafep.el (assoc-ignore-case): Stop marking as side-effect-free. * lisp/gnus/spam.el (spam-group-processor-p): Remove support for spam-list-of-processors. * lisp/progmodes/compile.el (define-compilation-mode) (compilation-handle-exit): Remove support for compilation-finish-function. * lisp/progmodes/cperl-mode.el (cperl-mode): Remove support for cperl-vc-header-alist. ; * lisp/files.el: Comments. ; * etc/NEWS: List removed items.
* | Replace uses of the obsolete local-write-file-hooksGlenn Morris2018-03-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | * lisp/net/quickurl.el (quickurl-reread-hook-postfix): * lisp/progmodes/ebrowse.el (ebrowse-tree-mode) (ebrowse-write-file-hook-fn): * lisp/progmodes/glasses.el (glasses-mode): * lisp/progmodes/vhdl-mode.el (vhdl-write-file-hooks-init): * lisp/vc/ediff-merg.el (ediff-set-merge-mode): * lisp/vc/ediff-util.el (ediff-setup): Replace local-write-file-hooks, obsolete since 22.1, with write-file-functions.
* | Merge from origin/emacs-26Glenn Morris2018-03-021-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0213c8b (origin/emacs-26) mwheel minor consistency fix 82f12b2 * src/window.c (Frecenter): Improve commentary. 04da8f4 Fix downloading non-text files in EWW 832b9ec ; Spelling fixes dd88499 ; Spelling fixes 3968f72 Rename some mwheel options, for consistency d6e78de * lisp/vc/add-log.el (add-change-log-entry): Replace obsolete... 5fe0387 Improve the Emacs manual 56ab8e3 * lisp/dired-aux.el (dired-do-create-files): Doc fix. (Bug#3... Conflicts: etc/NEWS lisp/mwheel.el
| * * lisp/vc/add-log.el (add-change-log-entry): Replace obsolete alias.Glenn Morris2018-03-011-1/+1
| |
* | Update some lisp function declarationsGlenn Morris2018-02-261-1/+1
| |
* | * lisp/vc/vc-git.el: Silence compiler.Glenn Morris2018-02-231-0/+3
| |
* | * lisp/vc/vc-git.el: Avoid bootstrap errors since recent grep change.Glenn Morris2018-02-221-2/+1
| | | | | | | | | | | | | | The introduction of grep-find-hide-properties caused an "invalid read syntax" failure when saving ja-dic.el, when vc-git.el loaded grep.el. Fortunately, vc-git doesn't actually need to load grep when being compiled.
* | Fix for: "25.0.50; auto-revert-mode breaks git rebase" (Bug#21559)Alexei Khlebnikov2018-02-221-1/+8
| | | | | | | | | | | | | | | | | | | | * lisp/autorevert.el (auto-revert-handler): Set "revert-buffer-in-progress-p" flag before calling "vc-refresh-state". * lisp/vc/vc-git.el (vc-git-command): If "revert-buffer-in-progress-p" flag is set, prepend "GIT_OPTIONAL_LOCKS=0" to "process-environment". (Bug#21559)
* | * lisp/vc/vc-dispatcher.el (vc-do-command): Bind message-truncate-lines to tJuri Linkov2018-02-211-14/+16
| | | | | | | | | | | | to keep entire commands in *Messages* but avoid resizing the echo area. Rephrase messages in a such way that the important parts are at the beginning. (Bug#19045)
* | * lisp/vc/diff-mode.el (diff-wiggle): New command.Stefan Monnier2018-02-181-16/+64
| |
* | Merge from origin/emacs-26Glenn Morris2018-02-173-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes f21f8e6 Document 'desktop-files-not-to-save' d8917eb Improve documentation of Profiling features b228839 Improve indexing of "performance" in ELisp manual ab67b3e Minor change in Emacs manual's VC chapter c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3... 593bbda Document comment-fill-column in the manual (Bug#11636) bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits. 69107f3 ; Fix doc typos related to indefinite articles aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 5906418 More fixes for the Emacs manual 9ab3df1 ; Fix doc typos related to indefinite articles 66a4e65 ; Fix doc typos related to indefinite articles 35e5c57 ; Fix doc typos related to indefinite articles
| * lisp/vc/: documentation fixesCharles A. Roelli2018-02-172-2/+5
| | | | | | | | | | | | * lisp/vc/vc.el (vc-region-history): Clarify documentation. * lisp/vc/add-log.el (change-log-get-method-definition): Indent documentation.
| * ; Fix doc typos related to indefinite articlesGlenn Morris2018-02-161-1/+1
| |
* | Merge from origin/emacs-26Glenn Morris2018-02-161-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a06a8ed (origin/emacs-26) ; * lisp/vc/vc-git.el (vc-git--program-vers... edc06ad Make 'byte-compile-error-on-warn' a safe file variable 9f5d8da ; * lisp/textmodes/flyspell.el (flyspell-auto-correct-word): ... f73905a Fix the doc string of flyspell-auto-correct-word e9c7ddc Improve the MS-Windows appendix of the Emacs manual 6ddb4bd Fix 'vc-git--program-version' 63c93f7 Fix typos and wording in the Emacs manual 42f15b0 * doc/emacs/programs.texi (Semantic): Order programming langu... b46be29 More improvements for the Emacs manual 874c0ed Minor wording change in Emacs manual 53511f9 Another set of changes for the manual 78426b8 Improvements on tramp.texi 0dca618 Tramp minor doc fixes Conflicts: doc/misc/tramp.texi
| * ; * lisp/vc/vc-git.el (vc-git--program-version): Fix last change.Eli Zaretskii2018-02-161-1/+1
| |
| * Fix 'vc-git--program-version'Eli Zaretskii2018-02-161-2/+5
| | | | | | | | | | * lisp/vc/vc-git.el (vc-git--program-version): Fix the function to work with Git for Windows.
* | Merge from origin/emacs-26Glenn Morris2018-02-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 333d6f4 (origin/emacs-26) More changes in the Emacs manual 52ca0d1 * lisp/vc/vc.el (vc-deduce-backend): Use ignore-errors. 69e8046 Don't signal error in vc-deduce-backend f568c91 * doc/misc/tramp.texi: Index more user options. 92ca881 Minor change in the Emacs manual e055a12 NEWS update about 'string-trim' 96b6e24 Clarify TRAMP process-environment interaction (Bug#30419) 4fa467e * lisp/progmodes/grep.el (grep-num-matches-found): New variable. a22820a Avoid aborts in cm.c due to too small TTY frame 26f6441 Another set of improvements in the Emacs manual cef3b42 Fix help in mode-line-mode-menu f8a493c Improve documentation of desktop restoring 10637af Improve the Emacs manual's chapter "Frames" d924953 Fix unbound mm-uu-entry in mm-uu cb2487b Improve Emacs user manual in fixit.texi 66e9527 Another minor change in the manual 6a1c03d More minor changes in the Emacs manual 32fb8c4 Avoid printing garbled error message from image.el Conflicts: etc/NEWS lisp/image.el
| * * lisp/vc/vc.el (vc-deduce-backend): Use ignore-errors.Andreas Schwab2018-02-131-3/+1
| |
| * Don't signal error in vc-deduce-backendAndreas Schwab2018-02-131-1/+3
| | | | | | | | | | * lisp/vc/vc.el (vc-deduce-backend): Return nil if vc-responsible-backend signals an error.
* | Merge from origin/emacs-26Glenn Morris2018-02-051-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c787a49 (origin/emacs-26) * lisp/vc/vc-git.el (vc-git-print-log): Res... b654791 * doc/emacs/misc.texi (Interactive Shell): Refer to node "Min... f1102d2 Yet another round of fixing the Emacs manual 76b5a68 * etc/NEWS: Expunge the solecism "allow(s)" + infinitive b4ff8cc Two minor fixes in Antinews aafcd12 * etc/NEWS: Rename image-dired-thumb-job-limit a893924 * lisp/simple.el (async-shell-command, shell-command): Fix gr... 699081f Fix deferred display of async shell-command buffers d2d5e54 Mention remote file name completion in Emacs manual f589f5a Yest another round of manual copyedits 1ed4089 Update xdisp.c commentary e23de39 Fix Bug#30324 e1a9dc0 Recognize Org as builtin package (bug#30310) Conflicts: etc/NEWS
| * * lisp/vc/vc-git.el (vc-git-print-log): Restrict file scope to a single fileJuri Linkov2018-02-041-3/+5
| | | | | | | | | | | | | | when vc-git-print-log-follow is non-nil (bug#19045). (vc-git-print-log-follow): Doc fix. * etc/NEWS: Mention 'vc-git-print-log-follow'.
* | * lisp/vc/add-log.el (change-log-next-buffer): Check file for nil.Juri Linkov2018-01-211-1/+1
| |
* | Merge from origin/emacs-26Glenn Morris2018-01-181-15/+15
|\| | | | | | | | | | | | | | | | | 7efb366 ; * etc/AUTHORS: Regenerate. 3dc7f68 * admin/authors.el (authors-aliases): Tighten more entries. 7428062 ; * lisp/vc/vc.el: Comment fixes. f4e6b6e Small startup fix for current-load-list 5b776bf ; * etc/AUTHORS: Regenerate. d80295c authors-aliases is based on regexps, not literals
| * ; * lisp/vc/vc.el: Comment fixes.Glenn Morris2018-01-161-15/+15
| |
* | * lisp/vc/vc-hg.el, lisp/vc/vc-git.el: Flush the 'vc-functions' cache.Stefan Monnier2018-01-182-0/+8
| |
* | Remove some more face aliases obsolete since 22.1Glenn Morris2018-01-101-2/+0
| | | | | | | | | | | | | | * lisp/generic-x.el (show-tabs-tab-face, show-tabs-space-face): * lisp/eshell/em-prompt.el (eshell-prompt-face): * lisp/vc/smerge-mode.el (smerge-base-face, smerge-markers-face): Remove face "-face" aliases, obsolete since 22.1.
* | Merge from origin/emacs-26Paul Eggert2018-01-091-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7668717d6f Merge from Gnulib 9e4d523427 * lisp/epg.el (epg-start-sign): Replace obsolete functions. 26c58f31a8 Small fix for erc-logging-enabled 34b41e3bc6 Quieten semantic normal usage e25f961e37 Avoid irrelevant hyperlink in doc string of 'epa-pinentry-... ec2636513c * doc/misc/tramp.texi (Remote processes): Mention gdb rest... 918a052a42 Query background for gnome terminal version 3.22 (Bug#29716) 1dfc27576a Make pixel-wise scrolling less laggy f92264fc2a Fix child frame placement issues (bug#29953) a5f718c4c5 ; * doc/lispref/text.texi (Change Hooks): Fix last change. e876f5f9fb Describe the precise interaction of complex primitives wit... 3a22097cf6 Fix valgrind report in call-interactively d5f1c87bfe * src/editfns.c (Fsave_excursion): Doc fix. (Bug#30001) b8d74c4578 Fix mark-defun when there's no spaces between successive d... a377c652b5 Fix Dired display and operations on file names with raw bytes d9d6e8a04c ; Comments related to src/termcap.c f8a07fa6b1 Improve documentation of 'gdb-many-windows' f82400798e Fix failures in smerge-mode on MS-Windows
| * Fix failures in smerge-mode on MS-WindowsEli Zaretskii2018-01-051-2/+4
| | | | | | | | | | | | | | | | | | * lisp/vc/smerge-mode.el (smerge--refine-chopup-region): Use utf-8-emacs-unix, not emacs-internal, to make the forced EOL convention explicit. (smerge-refine-regions): Use utf-8-emacs instead of emacs-internal, to allow decoding of non-Unix EOL conventions. (Bug#29916)
* | Merge from origin/emacs-26Paul Eggert2018-01-091-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | d382d2bfc5 * etc/DEBUG (Getting control to the debugger): Fix grammar. 687af4c8e8 * lisp/vc/vc.el (vc-region-history): log-view-vc-fileset h... 43e2aafae3 Don't bind dframe events on load (Bug#29599) ab31bf3c5f * lisp/textmodes/picture.el (picture-mode-exit): Doc fix. ... ed44d92fa6 * lisp/textmodes/picture.el (picture-open-line): Doc fix. ... b87a772612 Fix description of 'emacs-internal' a5256da588 Update PROBLEMS with selection-related issues c59ecb005e New customization variable for python-mode indentation (Bu... 4e20c8f220 Fix menu keyboard shortcuts on macOS (Bug#29595) # Conflicts: # etc/NEWS
| * * lisp/vc/vc.el (vc-region-history): log-view-vc-fileset holds a list!Stefan Monnier2018-01-031-1/+1
| |
* | Merge from origin/emacs-26Paul Eggert2018-01-0140-40/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63b04c11d5 Fix copyright years by hand 5c7dd8a783 Update copyright year to 2018 220a9ecba1 Merge from Gnulib 312c565566 Don't add empty keyboard macro to macro ring (Bug#24992) 39ca289a7a Allow customization of decoding of "man" command f8240815ea * etc/NEWS: Add security consideration note on passphrase ... 0c78822c70 Fix subtle problem with scroll-down when scroll-margin is ... acd289c5a4 Fix problems with indexing in User manual b240c7846b * lisp/help.el (describe-key): Only (copy-sequence elt) wh... e879a5444a * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846 81b1028b63 Improve documentation of 'inhibit-modification-hooks' and ... 7175496d7a Fix doc string of 'enable-recursive-minibuffers' 5b38406491 Fix documentation of delsel and of killing text # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
| * Update copyright year to 2018Paul Eggert2018-01-0140-40/+40
| | | | | | | | Run admin/update-copyright.
* | Fix vc-region-history when narrowedCharles A. Roelli2017-12-201-2/+2
| | | | | | | | | | * lisp/vc/vc.el (vc-region-history): Fix behavior when narrowed, by using line numbers starting from (point-min).
* | Ensure current buffer is version-controlled in vc-region-historyCharles A. Roelli2017-12-201-0/+2
| | | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-region-history): Ensure buffer is version-controlled. Otherwise if a user runs it in a non-version-controlled buffer, they get the error: Cannot open load file: No such file or directory, vc-nil
* | Fix infinite loop in vc-dir-mark-unmarkCharles A. Roelli2017-12-181-2/+6
| | | | | | | | | | * lisp/vc/vc-dir.el (vc-dir-mark-unmark): Prevent from getting stuck on the same line in an infinite loop. (Bug#24017)
* | Merge from origin/emacs-26Glenn Morris2017-12-166-23/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28e0261890 * lisp/progmodes/cc-defs.el (c-version): Update to 5.33.1. ac53084f9b Improve fix for Bug#29712 ffd4771560 * doc/lispref/sequences.texi (Sequence Functions): Improve... f274cbd185 Avoid reordering of output in 'shr-insert-document' 7890864413 Improve documentation of 'invisible-p' a1327bbc64 Remove one more check that Vframe_list is non-nil 63b6281fdd Fix off-by-one error in 'css--hex-color' 804b37ca63 Save and restore text-pixel height and width of frames (Bu... 777fe94661 Partially revert "Mention new strictness for &optional, &r... ad17db7964 * lisp/vc/smerge-mode.el (smerge-refine): Respect font-loc... 5a7d0095a4 * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete... e019c35df6 FOR_EACH_FRAME no longer assumes frame-list d64b88da2f * src/font.c (Ffont_info): Doc fix. (Bug#29682) 92b2604a7f Modernise message.el face spec syntax b1efbe6564 Update message.el obsolete face aliases 2494c14e76 ; * lisp/comint.el (comint-terminfo-terminal): Add a :vers... 12ad276d15 Improve documentation of TERM environment variable 8ed529f0f3 Add option to configure comint TERM 889f07c352 Better support utf-8-with-signature and utf-8-hfs in XML/HTML a2697fac0e * lisp/menu-bar.el (menu-bar-mode): Doc fix. ffb50eace6 ; * etc/NEWS: Fix last change. 95606af8b0 Fix Bug#29712 in tramp-tests.el 9bf66c6bee Don't run FOR_EACH_FRAME when there's no frame left (Bug#2... c2a88ec8e8 * lisp/textmodes/tex-mode.el: Ensure uncompiled file is lo... b178870528 Remember password change for IMAP in Gnus (Bug#29692) a21dac18bb Add %DUMBFW to the default GnuTLS priority strings 780407cff1 Small fixes prompted by make check-declare 541a60108d Fix some custom groups e220d6e112 Fix fontification of first declaration within a C++ lambda... aa66da220c * src/data.c (Fadd_variable_watcher): Doc fix. f838210b01 Fix misfontification of C++ member initialization list aft... 232c6465ce Fix doc-string of Fbuffer_list 3f9aac68d7 Don't raise an extraneous frame (bug#29696) e7b1111155 Mention new strictness for &optional, &rest in arglists (B... 4cb8696e47 Don't misfontify "foo ()" inside C++ initialization parent... ce31e726ad Fixes for defcustoms, prompted by cus-test-opts aacd1e14fc * lisp/net/newst-backend.el (newsticker--raw-url-list-defa... 7e2f4d3d41 * lisp/htmlfontify.el (hfy-which-etags): Fix it. 52d2a690f6 Add missing :version tags revealed by cusver-check f5d0360234 Escape column-zero doc parens # Conflicts: # etc/NEWS