diff options
author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/image-dired.el | |
parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
download | emacs-25-merge.tar.gz |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/image-dired.el')
-rw-r--r-- | lisp/image-dired.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/image-dired.el b/lisp/image-dired.el index c5efb338152..ae3921ccbad 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -1205,8 +1205,8 @@ comment." (defun image-dired-modify-mark-on-thumb-original-file (command) "Modify mark in dired buffer. -COMMAND is one of 'mark for marking file in dired, 'unmark for -unmarking file in dired or 'flag for flagging file for delete in +COMMAND is one of `mark' for marking file in dired, `unmark' for +unmarking file in dired or `flag' for flagging file for delete in dired." (let ((file-name (image-dired-original-file-name)) (dired-buf (image-dired-associated-dired-buffer))) |