diff options
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 | ||||
| -rw-r--r-- | lisp/vc/smerge-mode.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-rcs.el | 2 |
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.") "If non-nil, empty lines are valid in unified diffs. Some versions of diff replace all-blank context lines in unified format with empty lines. This makes the format less robust, but is tolerated. -See http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html") +See https://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html") (defconst diff-hunk-header-re (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." ;; 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. 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)) 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." ;; You might think that this should be distributed with RCS, but ;; apparently not. CVS sometimes provides a version of it. -;; http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00288.html +;; https://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00288.html (defvar vc-rcs-rcs2log-program (let (exe) (cond ((file-executable-p |