aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
authorPaul Eggert2017-11-25 22:45:41 -0800
committerPaul Eggert2017-11-25 22:48:12 -0800
commita89f0b6f33f9eb8910a1fceda9028d76ef50b05d (patch)
tree7055882872b7cad587e5d5e9ac706056f04ff777 /lisp/vc
parent8be3aee2813f528b02bc913ca4d79e34e72b1754 (diff)
downloademacs-a89f0b6f33f9eb8910a1fceda9028d76ef50b05d.tar.gz
emacs-a89f0b6f33f9eb8910a1fceda9028d76ef50b05d.zip
maint: shorten https://lists.gnu.org/archive/html/... links
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/diff-mode.el2
-rw-r--r--lisp/vc/smerge-mode.el2
-rw-r--r--lisp/vc/vc-git.el2
-rw-r--r--lisp/vc/vc-rcs.el2
4 files changed, 4 insertions, 4 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 9d56ed256a2..df9627abdf0 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -432,7 +432,7 @@ and the face `diff-added' for added lines.")
432 "If non-nil, empty lines are valid in unified diffs. 432 "If non-nil, empty lines are valid in unified diffs.
433Some versions of diff replace all-blank context lines in unified format with 433Some versions of diff replace all-blank context lines in unified format with
434empty lines. This makes the format less robust, but is tolerated. 434empty lines. This makes the format less robust, but is tolerated.
435See https://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html") 435See https://lists.gnu.org/r/emacs-devel/2007-11/msg01990.html")
436 436
437(defconst diff-hunk-header-re 437(defconst diff-hunk-header-re
438 (concat "^\\(?:" diff-hunk-header-re-unified ".*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")) 438 (concat "^\\(?:" diff-hunk-header-re-unified ".*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$"))
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 34fea232feb..b988463de1e 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -1094,7 +1094,7 @@ used to replace chars to try and eliminate some spurious differences."
1094 ;; also and more importantly because otherwise it 1094 ;; also and more importantly because otherwise it
1095 ;; may happen that diff doesn't behave like 1095 ;; may happen that diff doesn't behave like
1096 ;; smerge-refine-weight-hack expects it to. 1096 ;; smerge-refine-weight-hack expects it to.
1097 ;; See https://lists.gnu.org/archive/html/emacs-devel/2007-11/msg00401.html 1097 ;; See https://lists.gnu.org/r/emacs-devel/2007-11/msg00401.html
1098 "-awd" "-ad") 1098 "-awd" "-ad")
1099 file1 file2)) 1099 file1 file2))
1100 ;; Process diff's output. 1100 ;; Process diff's output.
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 060072ea54d..6b6f0f8d12c 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -978,7 +978,7 @@ This prompts for a branch to merge from."
978 ;; FIXME 978 ;; FIXME
979 ;; 1) the net result is to call git twice per file. 979 ;; 1) the net result is to call git twice per file.
980 ;; 2) v-g-c-f is documented to take a directory. 980 ;; 2) v-g-c-f is documented to take a directory.
981 ;; https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html 981 ;; https://lists.gnu.org/r/emacs-devel/2014-01/msg01126.html
982 (vc-git-conflicted-files buffer-file-name) 982 (vc-git-conflicted-files buffer-file-name)
983 (save-excursion 983 (save-excursion
984 (goto-char (point-min)) 984 (goto-char (point-min))
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 84ab10b14fe..4634e76088f 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -851,7 +851,7 @@ and CVS."
851 851
852;; You might think that this should be distributed with RCS, but 852;; You might think that this should be distributed with RCS, but
853;; apparently not. CVS sometimes provides a version of it. 853;; apparently not. CVS sometimes provides a version of it.
854;; https://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00288.html 854;; https://lists.gnu.org/r/emacs-devel/2014-05/msg00288.html
855(defvar vc-rcs-rcs2log-program 855(defvar vc-rcs-rcs2log-program
856 (let (exe) 856 (let (exe)
857 (cond ((file-executable-p 857 (cond ((file-executable-p