diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-10-01 19:53:56 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-10-01 19:59:01 -0700 |
| commit | 5172fa02cccaab2500ecf85aaf65b8deed54d42e (patch) | |
| tree | 6e3c39413eb2f1c039ba48626ccf7bc0df24c9f6 /lisp/vc/smerge-mode.el | |
| parent | 8cdd8b920a80e4c61270b0a90f51fb4c8db85c6e (diff) | |
| download | emacs-5172fa02cccaab2500ecf85aaf65b8deed54d42e.tar.gz | |
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/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
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." ;; also and more importantly because otherwise it ;; may happen that diff doesn't behave like ;; smerge-refine-weight-hack expects it to. - ;; See http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg00401.html + ;; See https://lists.gnu.org/archive/html/emacs-devel/2007-11/msg00401.html "-awd" "-ad") file1 file2)) ;; Process diff's output. |