diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/calendar/time-date.el | 1 | ||||
| -rw-r--r-- | lisp/international/ucs-normalize.el | 2 | ||||
| -rw-r--r-- | lisp/net/eww.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 7 |
4 files changed, 8 insertions, 4 deletions
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index 11ad92e7162..6fb0f22427a 100644 --- a/lisp/calendar/time-date.el +++ b/lisp/calendar/time-date.el @@ -148,6 +148,7 @@ it is assumed that PICO was omitted and should be treated as zero." ;; values. timezone-make-date-arpa-standard should help. (defun date-to-time (date) "Parse a string DATE that represents a date-time and return a time value. +DATE should be in one of the forms recognized by `parse-time-string'. If DATE lacks timezone information, GMT is assumed." (condition-case err (apply 'encode-time (parse-time-string date)) diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el index e212e14671e..9d55470d948 100644 --- a/lisp/international/ucs-normalize.el +++ b/lisp/international/ucs-normalize.el @@ -30,7 +30,7 @@ ;; ;; HFS-Normalization: ;; Reference: -;; http://developer.apple.com/technotes/tn/tn1150.html +;; https://developer.apple.com/library/archive/technotes/tn/tn1150.html ;; ;; HFS Normalization excludes following area for decomposition. ;; diff --git a/lisp/net/eww.el b/lisp/net/eww.el index a3f22aeb8a0..555b3bd5917 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1544,7 +1544,7 @@ Use link at point if there is one, else the current page's URL." (defun eww-download-callback (status url) (unless (plist-get status :error) (let* ((obj (url-generic-parse-url url)) - (path (car (url-path-and-query obj))) + (path (directory-file-name (car (url-path-and-query obj)))) (file (eww-make-unique-file-name (eww-decode-url-file-name (file-name-nondirectory path)) eww-download-directory))) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index e39d3d8b37c..a5c866d7503 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1996,10 +1996,13 @@ Saves the buffer to the file." (with-current-buffer filebuf (let ((failed t)) (unwind-protect - (let ((coding-system-for-read 'no-conversion) - (coding-system-for-write 'no-conversion)) + (let ((coding-system-for-read 'no-conversion)) (with-temp-file filename (let ((outbuf (current-buffer))) + ;; We will read the backend's output with no + ;; conversions, so we should also save the + ;; temporary file with no encoding conversions. + (setq buffer-file-coding-system 'no-conversion) ;; Change buffer to get local value of ;; vc-checkout-switches. (with-current-buffer filebuf |