diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-11-10 12:12:30 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-11-10 12:12:30 +0100 |
| commit | acf408934d771fe652fbd5a73e96cc12d93362c0 (patch) | |
| tree | 6507b1530f434fadede65e35d096505b7a098e33 /lisp | |
| parent | d7e7f92fc3752ab3db64bb72321d76dc9e6b43e4 (diff) | |
| parent | 8d81ab374da4d159cd05cd8caaaae2390829ccee (diff) | |
| download | emacs-acf408934d771fe652fbd5a73e96cc12d93362c0.tar.gz emacs-acf408934d771fe652fbd5a73e96cc12d93362c0.tar.bz2 emacs-acf408934d771fe652fbd5a73e96cc12d93362c0.zip | |
Merge from origin/emacs-28
8d81ab374d time-stamp: %F is "file name" not "pathname" + other doc
beaa7e14f3 ; Fix typos in CONTRIBUTE, ELisp manual, ediff
747a1ae4ac * doc/misc/eww.texi (Advanced): Fix missed variable name e...
52fe2340b8 * doc/emacs/windows.texi (Window Convenience): Use @code f...
7d3a654e2a * doc/emacs/maintaining.texi (Basic VC Editing): Mention D...
aeb19af4b5 ; * doc/emacs/building.texi (Lisp Libraries): Fix a typo. ...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/time-stamp.el | 4 | ||||
| -rw-r--r-- | lisp/vc/ediff.el | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el index 178e490fb7d..04e736d027c 100644 --- a/lisp/time-stamp.el +++ b/lisp/time-stamp.el @@ -65,7 +65,7 @@ with %, as follows. Non-date items: %% a literal percent character: `%' -%f file name without directory %F gives absolute pathname +%f file name without directory %F absolute file name %l login name %L full name of logged-in user %q unqualified host name %Q fully-qualified host name %h mail host name @@ -661,7 +661,7 @@ and all `time-stamp-format' compatibility." (if buffer-file-name (file-name-nondirectory buffer-file-name) time-stamp-no-file)) - ((eq cur-char ?F) ;buffer-file-name, full path + ((eq cur-char ?F) ;buffer-file-name, absolute name (or buffer-file-name time-stamp-no-file)) ((eq cur-char ?s) ;system name, legacy diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index 49fc60431f6..97c84ae5a18 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -983,9 +983,9 @@ STARTUP-HOOKS is a list of functions that Emacs calls without arguments after setting up the Ediff buffers." (interactive (let (bf) - (list (setq bf (read-buffer "Region's A buffer: " + (list (setq bf (read-buffer "Region A's buffer: " (ediff-other-buffer "") t)) - (read-buffer "Region's B buffer: " + (read-buffer "Region B's buffer: " (progn ;; realign buffers so that two visible bufs will be ;; at the top |