aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
authorPaul Eggert2017-10-01 19:53:56 -0700
committerPaul Eggert2017-10-01 19:59:01 -0700
commit5172fa02cccaab2500ecf85aaf65b8deed54d42e (patch)
tree6e3c39413eb2f1c039ba48626ccf7bc0df24c9f6 /lisp/vc
parent8cdd8b920a80e4c61270b0a90f51fb4c8db85c6e (diff)
downloademacs-5172fa02cccaab2500ecf85aaf65b8deed54d42e.tar.gz
emacs-5172fa02cccaab2500ecf85aaf65b8deed54d42e.zip
Prefer HTTPS to HTTP for gnu.org
This fixes some URLs I omitted from my previous pass, notably those in lists.gnu.org. Although lists.gnu.org does not yet support TLS 1.1, TLS 1.0 is better than nothing. * lisp/erc/erc.el (erc-official-location): * lisp/mail/emacsbug.el (report-emacs-bug): Use https:, not http:.
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 1e835f6f373..9d56ed256a2 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 http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html") 435See https://lists.gnu.org/archive/html/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 91be89b5dc1..34fea232feb 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 http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg00401.html 1097 ;; See https://lists.gnu.org/archive/html/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 9d7a4d49b8b..ed85603f828 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 ;; http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html 981 ;; https://lists.gnu.org/archive/html/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 9dffc144c6d..db1addbecd2 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -849,7 +849,7 @@ and CVS."
849 849
850;; You might think that this should be distributed with RCS, but 850;; You might think that this should be distributed with RCS, but
851;; apparently not. CVS sometimes provides a version of it. 851;; apparently not. CVS sometimes provides a version of it.
852;; http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00288.html 852;; https://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00288.html
853(defvar vc-rcs-rcs2log-program 853(defvar vc-rcs-rcs2log-program
854 (let (exe) 854 (let (exe)
855 (cond ((file-executable-p 855 (cond ((file-executable-p