summaryrefslogtreecommitdiff
path: root/lisp/vc/vc-git.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-10-01 19:53:56 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-10-01 19:59:01 -0700
commit5172fa02cccaab2500ecf85aaf65b8deed54d42e (patch)
tree6e3c39413eb2f1c039ba48626ccf7bc0df24c9f6 /lisp/vc/vc-git.el
parent8cdd8b920a80e4c61270b0a90f51fb4c8db85c6e (diff)
downloademacs-5172fa02cccaab2500ecf85aaf65b8deed54d42e.tar.gz
emacs-5172fa02cccaab2500ecf85aaf65b8deed54d42e.tar.bz2
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/vc-git.el')
-rw-r--r--lisp/vc/vc-git.el2
1 files changed, 1 insertions, 1 deletions
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."
;; FIXME
;; 1) the net result is to call git twice per file.
;; 2) v-g-c-f is documented to take a directory.
- ;; http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html
+ ;; https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html
(vc-git-conflicted-files buffer-file-name)
(save-excursion
(goto-char (point-min))