summaryrefslogtreecommitdiff
path: root/lisp/vc/vc-git.el
Commit message (Collapse)AuthorAgeFilesLines
...
* Also highlight 'conflict' with the warning faceDmitry Gutov2021-01-301-2/+2
| | | | | | * lisp/vc/vc-git.el (vc-git-dir-printer): Also highlight 'conflict' with the warning face, like vc-default-dir-printer does already.
* vc-dir-mode-map: Remove the mouse-2 bindingDmitry Gutov2021-01-301-1/+2
| | | | | | | | | | * lisp/vc/vc-dir.el (vc-dir-mode-map): Remove the mouse-2 binding (bug#13692). (vc-dir-mode): Update the docstring accordingly. (vc-dir-status-mouse-map): New variable. (vc-default-dir-printer): Use it on the state buttons. * lisp/vc/vc-git.el (vc-git-dir-printer): Same.
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
| | | | Run "TZ=UTC0 admin/update-copyright".
* * lisp/vc/vc-git.el: Update args of backend API calls in the header commentsJuri Linkov2020-12-061-1/+1
| | | | https://lists.gnu.org/archive/html/emacs-devel/2020-12/msg00283.html
* Prefer setq-local in vc/*.elStefan Kangas2020-12-051-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/add-log.el (find-change-log, change-log-mode): * lisp/vc/cvs-status.el (cvs-status-mode): * lisp/vc/diff-mode.el (diff-restrict-view, diff-find-file-name): (diff-mode, diff-setup-whitespace, diff-apply-hunk): * lisp/vc/diff.el (diff-no-select): * lisp/vc/ediff-util.el (ediff-setup): * lisp/vc/log-edit.el (log-edit, log-edit-mode): * lisp/vc/log-view.el (log-view-mode): * lisp/vc/pcvs.el (cvs-temp-buffer, cvs-make-cvs-buffer): (cvs-update-filter, cvs-mode, cvs-mode-commit) (cvs-mode-edit-log, cvs-vc-command-advice): * lisp/vc/smerge-mode.el (smerge-match-conflict): (smerge-ediff, smerge-mode): * lisp/vc/vc-annotate.el (vc-annotate-mode): (vc-annotate, vc-annotate-display): * lisp/vc/vc-bzr.el (vc-bzr-log-view-mode): * lisp/vc/vc-dir.el (vc-dir-mode): * lisp/vc/vc-dispatcher.el (vc-setup-buffer): (vc-compilation-mode, vc-start-logentry): * lisp/vc/vc-git.el (vc-git-log-view-mode): * lisp/vc/vc-hg.el (vc-hg-log-view-mode): * lisp/vc/vc-hooks.el (vc-refresh-state): * lisp/vc/vc-mtn.el (vc-mtn-log-view-mode): * lisp/vc/vc-svn.el (vc-svn-log-view-mode): * lisp/vc/vc.el (vc-register, vc-diff-internal): (vc-find-revision-save, vc-find-revision-no-save): (vc-log-internal-common, vc-region-history): Prefer setq-local.
* vc-git-root: Remove unnecessary cachingDmitry Gutov2020-10-261-2/+1
| | | | * lisp/vc/vc-git.el (vc-git-root): Simplify (bug#42966).
* Use the full name of the null byte/character, not its abbreviationAndreas Schwab2020-10-051-2/+2
| | | | | | | | | | | | | | | | | | | | | * lisp/subr.el (inhibit-nul-byte-detection): Make it an obsolete alias. * src/coding.c (setup_coding_system): Use original name. (detect_coding): Rename nul_byte_found => null_byte_found. (detect_coding_system): Use original name. Rename nul_byte_found => null_byte_found. (Fdefine_coding_system_internal): Use original name. (syms_of_coding): Rename inhibit-nul-byte-detection to inhibit-null-byte-detection. * src/w16select.c (get_clipboard_data): Rename nul_char to null_char. * src/json.c (check_string_without_embedded_nulls): Rename from check_string_without_embedded_nuls. (Fjson_parse_string): Adjust accordingly. * src/coding.h (enum define_coding_undecided_arg_index) (enum coding_attr_index): Rename ...nul_byte... to ...null_byte.... * lisp/info.el (info-insert-file-contents, Info-insert-dir): * lisp/international/mule.el (define-coding-system): * lisp/vc/vc-git.el (vc-git--call): * doc/lispref/nonascii.texi (Lisp and Coding Systems): Use original name.
* Don't have vc-git-stash-list bug out on the .git directoryDmitry Gutov2020-09-201-6/+7
| | | | | * lisp/vc/vc-git.el (vc-git-stash-list): Don't bug out when running on the .git directory itself (bug#39285).
* Add a variable to control VC completion over branch namesTom Tromey2020-08-191-3/+15
| | | | | | * lisp/vc/vc-git.el (vc-git-revision-complete-only-branches): New variable (bug#25710). (vc-git-revision-table): Use it.
* Notify the user if we errors when querying for registered git filesEmilio Lopes2020-08-131-1/+1
| | | | | * lisp/vc/vc-git.el (vc-git-registered): Notify the user when something fails here (bug#18481).
* * lisp/vc/vc-git.el (vc-git-log-view-mode): Font-lock AuthorDate (bug#40248)Juri Linkov2020-07-291-1/+1
| | | | | Highlight "AuthorDate" in log-view-font-lock-keywords when [format] pretty = fuller.
* * lisp/vc/vc-git.el (vc-git-log-view-mode): Fix commit regexp (bug#40248)Juri Linkov2020-07-241-1/+1
| | | | | The regexp 'log-view-message-re' should match e.g. "commit 123456789", not "CommitDate".
* Bind default-directory to given DIR.Tassilo Horn2020-06-181-0/+1
| | | | | | | | Otherwise, "git config branch.<branch>.remote" would return the global default "origin" instead of the actual, project-specific remote name. * lisp/vc/vc-git.el (vc-git-dir-extra-headers): Bind default-directory to given DIR.
* vc-git-dir-extra-headers: Fix recent breakageDmitry Gutov2020-06-181-2/+2
| | | | | | | * lisp/vc/vc-git.el (vc-git-dir-extra-headers): Account for 'remote' being set to "" when not found (https://lists.gnu.org/archive/html/emacs-devel/2020-06/msg00582.html). (vc-git-dir-extra-headers): Check the value of remote-url instead.
* Use vc-git-repository-url in vc-git-dir-extra-headersTassilo Horn2020-06-151-11/+5
| | | | | * lisp/vc/vc-git.el (vc-git-dir-extra-headers): Use vc-git-repository-url for getting the remote's URL.
* Add optional remote-name argument to VC repository-url commandTassilo Horn2020-06-151-2/+3
| | | | | | | | | | | * lisp/vc/vc.el: Document new remote-name argument of VC repository-url command. * lisp/vc/vc-git.el (vc-git-repository-url): Add and use new arg. * lisp/vc/vc-hg.el (vc-hg-repository-url): Add and use new arg. * lisp/vc/vc-bzr.el (vc-bzr-repository-url): Add new arg but ignore it. * lisp/vc/vc-svn.el (vc-svn-repository-url): Add new arg but ignore it.
* Add new VC command `repository-url'Tassilo Horn2020-06-141-0/+7
| | | | | | | | * lisp/vc/vc.el: Document repository-url command. * lisp/vc/vc-bzr.el (vc-bzr-repository-url): New defun. * lisp/vc/vc-git.el (vc-git-repository-url): New defun. * lisp/vc/vc-hg.el (vc-hg-repository-url): New defun. * lisp/vc/vc-svn.el (vc-svn-repository-url): New defun.
* Implement 'mark-resolved' for the Git backendDmitry Gutov2020-05-231-0/+4
| | | | * lisp/vc/vc-git.el (vc-git-mark-resolved): New function.
* Merge from origin/emacs-27Glenn Morris2020-01-151-2/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e936f18f8 (origin/emacs-27) Fix build failure with --with-cairo --wi... c34f7e884b Add new node "Package Statuses" to manual fdee034ac8 * lisp/isearch.el: Fix corner cases of isearch-lazy-count. 7b14329d86 ; * lisp/simple.el (messages-buffer): Doc fix. (Bug#39124) 7ec66a59e3 Document spacing issues with Xft for some fonts 08cd247fbd ; * etc/NEWS: Fix typo. d645628e3c Always use lexical-binding in lisp-interaction-mode (bug#3... c42198f78c ; *etc/NEWS: Fix typo. 0ed9cfa7dc vc-dir: ensure we don't use a pager with git 37e0d00c14 Improve ERC's matching of nicks and URLs (bug#38257) d47b157969 Handle tab-bar clicks on a GPM-capable console. e4791f3f8e ;* etc/TODO: Update. # Conflicts: # etc/NEWS
| * vc-dir: ensure we don't use a pager with gitRobert Pluim2020-01-131-2/+1
| | | | | | | | | | * lisp/vc/vc-git.el (vc-git--call): Call git with '--no-pager' to avoid hangs caused by remote pager settings (Bug#38688).
* | Merge from origin/emacs-27Paul Eggert2020-01-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | 186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3 4cd143aded Fix copyright years by hand 365e01cc9f Update copyright year to 2020 cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac... # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
| * Update copyright year to 2020Paul Eggert2020-01-011-1/+1
| | | | | | | | Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
* | Use regexp type for regexps in defcustom declarationsMattias Engdegård2019-12-261-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/calendar/diary-lib.el (diary-face-attrs): * lisp/cedet/semantic/db-ebrowse.el (semanticdb-ebrowse-file-match): * lisp/cedet/srecode/document.el (srecode-document-autocomment-common-nouns-abbrevs) (srecode-document-autocomment-function-alist) (srecode-document-autocomment-return-first-alist) (srecode-document-autocomment-return-last-alist) (srecode-document-autocomment-param-alist) (srecode-document-autocomment-param-type-alist): * lisp/desktop.el (desktop-clear-preserve-buffers): * lisp/elide-head.el (elide-head-headers-to-hide): * lisp/erc/erc-backend.el (erc-encoding-coding-alist): * lisp/erc/erc-ezbounce.el (erc-ezb-regexp): * lisp/files.el (auto-save-file-name-transforms): * lisp/gnus/deuglify.el (gnus-outlook-deuglify-attrib-cut-regexp) (gnus-outlook-deuglify-attrib-verb-regexp) (gnus-outlook-deuglify-attrib-end-regexp): * lisp/gnus/gnus-fun.el (gnus-x-face-omit-files, gnus-face-omit-files): * lisp/gnus/spam.el (spam-spamassassin-positive-spam-flag-header): * lisp/htmlfontify.el (hfy-src-doc-link-unstyle): * lisp/info-look.el (info-lookup-file-name-alist): * lisp/international/rfc1843.el (rfc1843-newsgroups-regexp): * lisp/mail/feedmail.el (feedmail-queue-slug-suspect-regexp): * lisp/mail/rmail-spam-filter.el (rsf-white-list, rsf-definitions-alist): * lisp/man.el (Man-name-local-regexp): * lisp/net/ange-ftp.el (ange-ftp-dumb-unix-host-regexp): * lisp/net/newst-backend.el (newsticker-auto-mark-filter-list): * lisp/net/rcirc.el (rcirc-authinfo, rcirc-coding-system-alist): * lisp/net/tramp-adb.el (tramp-adb-prompt): * lisp/org/org-agenda.el (org-agenda-hide-tags-regexp) (org-agenda-category-icon-alist): * lisp/org/org-protocol.el (org-protocol-data-separator): * lisp/org/org-table.el (org-table-number-regexp): * lisp/org/ox-latex.el (org-latex-known-warnings): * lisp/progmodes/bug-reference.el (bug-reference-bug-regexp): * lisp/progmodes/hideif.el (hide-ifdef-header-regexp): * lisp/progmodes/idlw-help.el (idlwave-help-doclib-name) (idlwave-help-doclib-keyword): * lisp/progmodes/idlwave.el (idlwave-no-change-comment): * lisp/progmodes/python.el (python-shell-prompt-input-regexps) (python-shell-prompt-output-regexps, python-shell-prompt-regexp) (python-shell-prompt-block-regexp, python-shell-prompt-output-regexp) (python-shell-prompt-pdb-regexp, python-shell-compilation-regexp-alist) (python-pdbtrack-stacktrace-info-regexp): * lisp/progmodes/sql.el (sql-send-terminator, sql-ansi-statement-starters): * lisp/speedbar.el (speedbar-directory-unshown-regexp) (speedbar-file-unshown-regexp): * lisp/textmodes/flyspell.el (flyspell-mark-duplications-exceptions) (flyspell-tex-command-regexp): * lisp/textmodes/paragraphs.el (sentence-end-base): * lisp/textmodes/tildify.el (tildify-pattern, tildify-space-pattern): * lisp/vc/ediff-init.el (ediff-metachars): * lisp/vc/vc-git.el (vc-git-root-log-format): * lisp/vc/vc-hg.el (vc-hg-root-log-format): * lisp/whitespace.el (whitespace-indentation-regexp) (whitespace-space-after-tab-regexp): * lisp/woman.el (woman-manpath-man-regexp) (woman-imenu-generic-expression): Use 'regexp' instead of 'string' as type for values that are regexps in defcustom declarations.
* Make ls-files-unknown only return proper files, not directoriesAndrii Kolomoiets2019-12-171-2/+1
| | | | | | * lisp/vc/vc-git.el (vc-git-dir-status-goto-stage): Make ls-files-unknown only return proper files, not directories (bug#38615).
* vc-git-after-dir-status-stage: Avoid erroneous up-to-date statusDmitry Gutov2019-12-171-8/+13
| | | | | | * lisp/vc/vc-git.el (vc-git-after-dir-status-stage): Don't set `up-to-date' status if the previous stage (`diff-index') has assigned some other status to the file (bug#38615).
* 'C-1 C-x v L' asks for revision and shows its log entry with diff (bug#38044)Juri Linkov2019-11-281-5/+6
| | | | | | | | | | | | | | | | | * doc/emacs/maintaining.texi (VC Change Log): Explain the numeric prefix arg of 'C-x v L' (vc-print-root-log). * lisp/vc/vc-git.el (vc-git-print-log): Add command line option "-p" when vc-log-view-type is 'with-diff'. (vc-git-log-view-mode): Use long style when vc-log-view-type is 'with-diff'. * lisp/vc/vc.el (vc-print-log-internal): Add optional arg 'type'. (vc-log-internal-common): Use 'region-history-mode' when type is 'with-diff' and backend supports 'region-history-mode'. (vc-print-root-log): Add optional arg 'revision'. In interactive spec read a revision when current-prefix-arg is 1. Use current-prefix-arg "as is" when it is a number. Show revision in long style with diff when limit is 1 and revision is non-nil.
* Support 'vc-region-history' for MercurialEli Zaretskii2019-11-211-3/+3
| | | | | | | | | | | | | | | | * lisp/vc/vc-hg.el (vc-hg-region-history) (vc-hg-region-history-font-lock, vc-hg-region-history-mode): New functions. (vc-hg-region-history-mode-map) (vc-hg--log-view-long-font-lock-keywords) (vc-hg-region-history-font-lock-keywords): New variables. * lisp/vc/vc-git.el (vc-git-region-history): Update commentary. * doc/emacs/maintaining.texi (VC Change Log): Add 'vc-region-history' to the table at beginning of node. Update the VCSes that support 'vc-region-history'. * etc/NEWS: Mention the new feature of vc-hg.el.
* VC: ability to skip update buffers promptAndrii Kolomoiets2019-11-141-0/+2
| | | | | | | | | | | * lisp/vc/vc.el (vc-default-update-on-retrieve-tag): New function. (vc-retrieve-tag): Call `update-on-retrieve-tag' backend function to determine if prompt for update buffers is needed; Include tag name into the "Retrieving tag" message. * lisp/vc/vc-git.el (vc-git-update-on-retrieve-tag): * lisp/vc/vc-hg.el (vc-hg-update-on-retrieve-tag): * lisp/vc/vc-svn.el (vc-svn-udate-on-retrieve-tag): New functions. Buffers update prompt on `vc-retrieve-tag' is omitted (bug#38156).
* Fix some quoting glitches in doc stringsPaul Eggert2019-11-111-2/+2
|
* Rework vc stash bindingsRobert Pluim2019-10-311-17/+40
| | | | | | | | | | | | | | | | | | | | | | | This adds create/snapshot bindings to the stash button even when there are no stashes, and extends the stash menu bindings. * etc/NEWS: Announce the bindings. * lisp/vc/vc-git.el (vc-git-stash-shared-map): New keymap. Holds shared bindings between stash button and stash list. (vc-git-stash-map): Inherit from vc-git-stash-shared-map. (vc-git-stash-button-map): New keymap. Holds button bindings, inherit from vc-git-stash-shared-map. (vc-git-stash-shared-help, vc-git-stash-list-help): New defconsts. Abstract out list/button help texts. (vc-git--make-button-text): Set keymap property to vc-git-stash-button-map. (vc-git-make-stash-button): Use vc-git-stash-shared-help. (vc-git-stash-menu-map): Add items for vc-git-stash and vc-git-stash-snapshot. (vc-git-dir-extra-headers): Use vc-git-stash-list-help and vc-git-stash-shared-help. Add vc-git-stash and vc-git-stash-snapshot bindings to text shown when there are no stashes.
* Bind vc-git-stash to a keyLars Ingebrigtsen2019-10-301-1/+2
| | | | | | | | | * lisp/vc/vc-git.el (vc-git-stash-map): Give `vc-git-stash' a keystroke, because it's a useful command. When there are no stashes, there's no way to use that keystroke (since it's only bound on the stash lines), so perhaps that should also be fixed somehow.
* Show stash counts in button in vc-dirRobert Pluim2019-10-221-16/+37
| | | | | | | | | | | | Based on suggestions from Mattias Engdegård. * lisp/vc/vc-git.el (vc-git--make-button-text): New function to generate text for stash button. (vc-git-make-stash-button): Show stash counts. Delete and recreate button when toggling. (vc-git-dir-extra-headers): Pass counts to vc-git-make-stash-button. Treat stash count <= vc-git-show-stash as equivalent to showing entire list.
* Add button to vc-dir to toggle visibility of stash listRobert Pluim2019-10-211-18/+84
| | | | | | | | | | | | | * lisp/vc/vc-git.el: Move cl-lib require outside 'eval-when-compile'. * lisp/vc/vc-git.el (vc-git-show-stash):New user option. (vc-git-make-stash-button): Create button that allows hiding the stash list. (vc-git-dir-extra-headers): Split stash list into hideable and non-hideable parts depending on value of vc-git-show-stash. Add button to toggle visibility of hideable part. * etc/NEWS: Announce it.
* * lisp/vc/vc.el (vc-log-search): Fix docstring (bug#36644).Juri Linkov2019-07-251-0/+10
| | | | * lisp/vc/vc-git.el (vc-git-log-search): Add docstring.
* * lisp/vc/vc-git.el (vc-git-log-search): Remove shell-quote-argument.Juri Linkov2019-07-191-3/+1
| | | | (Bug#36644)
* * lisp/vc/vc.el (vc-log-search): New command (bug#36644).Juri Linkov2019-07-161-2/+18
| | | | | * lisp/vc/vc-git.el (vc-git-log-search): New function. (vc-git-log-view-mode): Check vc-log-view-type for log-search.
* * lisp/vc/vc-dir.el (vc-dir-view-file): New command for consistency with diredJuri Linkov2019-07-081-2/+0
| | | | | * lisp/vc/vc-git.el (vc-git-log-incoming, vc-git-log-outgoing): Remove interactive spec from non-command functions. (Bug#12492)
* Add imenu support to package-menu-modeAntoine Beaupré2019-06-251-1/+2
| | | | | | | | * lisp/vc/vc-git.el (vc-git-grep-template): Include <C> in template to be more consistent with lgrep/rgrep (bug#35326). This will introduce the --color and -i flags to the "git grep" command. Copyright-paperwork-exempt: yes
* Add doc strings to the -at-point commands in vc-gitLars Ingebrigtsen2019-06-171-0/+4
| | | | | | * lisp/vc/vc-git.el (vc-git-stash-delete-at-point) (vc-git-stash-show-at-point, vc-git-stash-apply-at-point) (vc-git-stash-pop-at-point): Add doc strings to these commands.
* ; Revert "Publicize behavior of log-view-diff at beginning/end of active region"Dmitry Gutov2019-06-101-2/+2
| | | | | | | This reverts commit 82db17d0d1231c4aa26e837f37428c44a67663ea. Undo the half-baked implementation of the new feature in Git log buffers until we can do it better (bug#35624).
* Publicize behavior of log-view-diff at beginning/end of active regionJuri Linkov2019-05-191-2/+2
| | | | | | | | | | * lisp/vc/log-view.el (log-view-diff, log-view-diff-changeset): * doc/emacs/maintaining.texi (VC Change Log): Document behavior of log-view-diff at the beginning and the end of the log buffer when the region is active. (Bug#35624) * lisp/vc/vc-git.el (vc-git-print-log): Insert newline at the beginning to enable the feature of diffing with the working revision.
* Add standard unmatchable regexpMattias Engdegård2019-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `regexp-unmatchable' as a standard unmatchable regexp, defined as "\\`a\\`". Use it where such a regexp is needed, replacing slower expressions in several places. From a suggestion by Philippe Schnoebelen. * lisp/subr.el (regexp-unmatchable): New defconst. * etc/NEWS (Lisp Changes): Mention `regexp-unmatchable'. * doc/lispref/searching.texi (Regexp Functions): Document it. * lisp/emacs-lisp/regexp-opt.el (regexp-opt) * lisp/progmodes/cc-defs.el (cc-conditional-require-after-load) (c-make-keywords-re) * lisp/progmodes/cc-engine.el (c-beginning-of-statement-1) (c-forward-<>-arglist-recur, c-forward-decl-or-cast-1) (c-looking-at-decl-block) * lisp/progmodes/cc-fonts.el (c-doc-line-join-re) (c-doc-bright-comment-start-re) * lisp/progmodes/cc-langs.el (c-populate-syntax-table) (c-assignment-op-regexp) (c-block-comment-ender-regexp, c-font-lock-comment-end-skip) (c-block-comment-start-regexp, c-line-comment-start-regexp) (c-doc-comment-start-regexp, c-decl-start-colon-kwd-re) (c-type-decl-prefix-key, c-type-decl-operator-prefix-key) (c-pre-id-bracelist-key, c-enum-clause-introduction-re) (c-nonlabel-token-2-key) * lisp/progmodes/cc-mode.el (c-doc-fl-decl-start, c-doc-fl-decl-end) * lisp/progmodes/cc-vars.el (c-noise-macro-with-parens-name-re) (c-noise-macro-name-re, c-make-noise-macro-regexps) * lisp/progmodes/octave.el (octave-help-mode) * lisp/vc/vc-bzr.el (vc-bzr-log-view-mode, vc-bzr-revision-completion-table) * lisp/vc/vc-git.el (vc-git-log-view-mode) * lisp/vc/vc-hg.el (vc-hg-log-view-mode) * lisp/vc/vc-mtn.el (vc-mtn-log-view-mode): Use `regexp-unmatchable'. * lisp/textmodes/ispell.el (ispell-non-empty-string): Use `regexp-unmatchable', fixing a broken never-match regexp.
* Support amending the last commit using VC-HgDmitry Gutov2019-04-211-18/+7
| | | | | | | | | | * lisp/vc/log-edit.el (log-edit--toggle-amend): Extract from vc-git-log-edit-toggle-amend (bug#34944). * lisp/vc/vc-hg.el (vc-hg-log-edit-toggle-amend): New function. Use the aforementioned. (vc-hg-log-edit-mode-map): New variable. (vc-hg-log-edit-mode): New major mode.
* * lisp/vc/vc.el (vc-diff-mergebase, vc-log-mergebase): New commands.Juri Linkov2019-03-251-4/+16
| | | | | | | | * lisp/vc/vc-git.el (vc-git-mergebase): New function. (vc-git-print-log): Interpret string value of arg LIMIT as an end-revision. * lisp/vc/vc-hooks.el (vc-prefix-map): Bind 'vc-log-mergebase' to 'C-x v M L', and 'vc-diff-mergebase' to 'C-x v M D'. (Bug#33950)
* Fix misuses of NULL when talking about the NUL characterStefan Monnier2019-03-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | * lisp/subr.el (inhibit-null-byte-detection): Make it an obsolete alias. * src/coding.c (setup_coding_system): Use new name. (detect_coding): Rename null_byte_found => nul_byte_found. (detect_coding_system): Use new name. Rename null_byte_found => nul_byte_found. (Fdefine_coding_system_internal): Use new name. (syms_of_coding): Rename inhibit-null-byte-detection to inhibit-nul-byte-detection. * src/w16select.c (get_clipboard_data): null_char => nul_char. * src/json.c (check_string_without_embedded_nuls): Rename from check_string_without_embedded_nulls. (Fjson_parse_string): Adjust accordingly. * src/coding.h (enum define_coding_undecided_arg_index) (enum coding_attr_index): ...null_byte... => ...nul_byte.... * lisp/info.el (info-insert-file-contents, Info-insert-dir): * lisp/international/mule.el (define-coding-system): * lisp/vc/vc-git.el (vc-git--call): * doc/lispref/nonascii.texi (Lisp and Coding Systems): Use the new name.
* Fix regexp typo in vc-git--program-versionPaul Eggert2019-03-161-1/+1
| | | | | * lisp/vc/vc-git.el (vc-git--program-version): Require a period after ".windows", instead of allowing any char.
* Fix some ineffective backslashes in string literalsMattias Engdegård2019-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Deal with lone backslashes that have no effect in string literals, but indicate that something is amiss. * lisp/auth-source-pass.el (auth-source-pass-entries): * lisp/textmodes/artist.el (artist-figlet-get-font-list-windows): * lisp/org/ob-abc.el (org-babel-expand-body:abc, org-babel-execute:abc): * lisp/org/ob-forth.el (org-babel-forth-session-execute): * lisp/vc/vc-git.el (vc-git--program-version): Add backslash in regexp for correctness. * lisp/gnus/nnmail.el (nnmail-split-abbrev-alist): Replace `\||' with `\\|' to follow the obvious regexp intent. * lisp/org/org-list.el (org-plain-list-ordered-item-terminator): Add backslash in doc comment so that it appears as intended. * lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1, c-end-of-decl-1): * lisp/progmodes/f90.el (f90-font-lock-keywords-2): * lisp/progmodes/etags.el (etags-tags-completion-table): * lisp/progmodes/ruby-mode.el (ruby-syntax-propertize): * test/lisp/emacs-lisp/cl-print-tests.el (cl-print-tests-1): Remove superfluous backslashes from regexp. * test/lisp/emacs-lisp/rx-tests.el (rx-char-any): Remove superfluous backslash from doc comment.
* Avoid some double-rounding of Lisp timestampsPaul Eggert2019-02-221-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, simplify some time-related Lisp timestamp code while we’re in the neighborhood. * lisp/battery.el (battery-linux-proc-acpi) (battery-linux-sysfs, battery-upower, battery-bsd-apm): * lisp/calendar/timeclock.el (timeclock-seconds-to-string) (timeclock-log, timeclock-last-period) (timeclock-entry-length, timeclock-entry-list-span) (timeclock-find-discrep, timeclock-generate-report): * lisp/cedet/ede/detect.el (ede-detect-qtest): * lisp/completion.el (cmpl-hours-since-origin): * lisp/ecomplete.el (ecomplete-decay-1): * lisp/emacs-lisp/ert.el (ert--results-update-stats-display) (ert--results-update-stats-display-maybe): * lisp/emacs-lisp/timer-list.el (list-timers): * lisp/emacs-lisp/timer.el (timer-until) (timer-event-handler): * lisp/erc/erc-backend.el (erc-server-send-ping) (erc-server-send-queue, erc-handle-parsed-server-response) (erc-handle-unknown-server-response): * lisp/erc/erc-track.el (erc-buffer-visible): * lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p) (erc-cmd-PING, erc-send-current-line): * lisp/eshell/em-pred.el (eshell-pred-file-time): * lisp/eshell/em-unix.el (eshell-show-elapsed-time): * lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp): * lisp/gnus/gnus-int.el (gnus-backend-trace): * lisp/gnus/gnus-sum.el (gnus-user-date): * lisp/gnus/mail-source.el (mail-source-delete-crash-box): * lisp/gnus/nnmaildir.el (nnmaildir--scan): * lisp/ibuf-ext.el (ibuffer-mark-old-buffers): * lisp/gnus/nnmaildir.el (nnmaildir--scan): * lisp/mouse.el (mouse--down-1-maybe-follows-link) (mouse--click-1-maybe-follows-link): * lisp/mpc.el (mpc--faster-toggle): * lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE) (rcirc-sentinel): * lisp/net/tramp-cache.el (tramp-get-file-property): * lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p) (tramp-maybe-open-connection): * lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection): * lisp/org/org-clock.el (org-clock-resolve): (org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum): * lisp/org/org-timer.el (org-timer-start) (org-timer-pause-or-continue, org-timer-seconds): * lisp/org/org.el (org-evaluate-time-range): * lisp/org/ox-publish.el (org-publish-cache-ctime-of-src): * lisp/pixel-scroll.el (pixel-scroll-in-rush-p): * lisp/play/hanoi.el (hanoi-move-ring): * lisp/proced.el (proced-format-time): * lisp/progmodes/cpp.el (cpp-progress-message): * lisp/progmodes/flymake.el (flymake--handle-report): * lisp/progmodes/js.el (js--wait-for-matching-output): * lisp/subr.el (progress-reporter-do-update): * lisp/term/xterm.el (xterm--read-event-for-query): * lisp/time.el (display-time-update, emacs-uptime): * lisp/tooltip.el (tooltip-delay): * lisp/url/url-cookie.el (url-cookie-parse-file-netscape): * lisp/url/url-queue.el (url-queue-prune-old-entries): * lisp/url/url.el (url-retrieve-synchronously): * lisp/xt-mouse.el (xterm-mouse-event): Avoid double-rounding of time-related values. Simplify. * lisp/calendar/icalendar.el (icalendar--decode-isodatetime): When hoping for the best (unlikely), use a better decoded time. (icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time. * lisp/calendar/timeclock.el (timeclock-when-to-leave): * lisp/cedet/ede/detect.el (ede-detect-qtest): * lisp/desktop.el (desktop-create-buffer): * lisp/emacs-lisp/benchmark.el (benchmark-elapse): * lisp/gnus/gnus-art.el (article-lapsed-string): * lisp/gnus/gnus-group.el (gnus-group-timestamp-delta): * lisp/gnus/nnmail.el (nnmail-expired-article-p): * lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles): * lisp/nxml/rng-maint.el (rng-time-function): * lisp/org/org-clock.el (org-clock-get-clocked-time) (org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle): * lisp/org/org-habit.el (org-habit-insert-consistency-graphs): * lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info) (vhdl-fix-case-region-1): Use time-since instead of open-coding most of it. * lisp/erc/erc-dcc.el (erc-dcc-get-sentinel): * lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt): Now obsolete. All uses changed. (erc-time-diff): Accept all Lisp time values. All uses changed. * lisp/gnus/gnus-demon.el (gnus-demon-idle-since): * lisp/gnus/gnus-score.el (gnus-score-headers): * lisp/gnus/nneething.el (nneething-make-head): * lisp/gnus/nnheader.el (nnheader-message-maybe): * lisp/gnus/nnimap.el (nnimap-keepalive): * lisp/image.el (image-animate-timeout): * lisp/mail/feedmail.el (feedmail-rfc822-date): * lisp/net/imap.el (imap-wait-for-tag): * lisp/net/newst-backend.el (newsticker--image-get): * lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333): * lisp/obsolete/xesam.el (xesam-refresh-entry): * lisp/org/org-agenda.el (org-agenda-show-clocking-issues) (org-agenda-check-clock-gap, org-agenda-to-appt): * lisp/org/org-capture.el (org-capture-set-target-location): * lisp/org/org-clock.el (org-clock-resolve-clock) (org-clocktable-steps): * lisp/org/org-colview.el (org-columns-edit-value) (org-columns, org-agenda-columns): * lisp/org/org-duration.el (org-duration-from-minutes): * lisp/org/org-element.el (org-element-cache-sync-duration) (org-element-cache-sync-break) (org-element--cache-interrupt-p, org-element--cache-sync): * lisp/org/org-habit.el (org-habit-get-faces) * lisp/org/org-indent.el (org-indent-add-properties): * lisp/org/org-table.el (org-table-sum): * lisp/org/org-timer.el (org-timer-show-remaining-time) (org-timer-set-timer): * lisp/org/org.el (org-babel-load-file, org-today) (org-auto-repeat-maybe, org-2ft, org-time-stamp) (org-read-date-analyze, org-time-stamp-to-now) (org-small-year-to-year, org-goto-calendar): * lisp/org/ox.el (org-export-insert-default-template): * lisp/ses.el (ses--time-check): * lisp/type-break.el (type-break-time-warning) (type-break-statistics, type-break-demo-boring): * lisp/url/url-cache.el (url-cache-expired) (url-cache-prune-cache): * lisp/vc/vc-git.el (vc-git-stash-snapshot): * lisp/erc/erc-match.el (erc-log-matches-come-back): Simplify.
* 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)'.
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-23 02:25:04 +0000