diff options
| author | Tassilo Horn <tsdh@gnu.org> | 2019-09-22 11:02:39 +0200 |
|---|---|---|
| committer | Tassilo Horn <tsdh@gnu.org> | 2019-09-22 11:02:39 +0200 |
| commit | af0642a4cb220f33a43d1380be085bc0b7134bb8 (patch) | |
| tree | e3b1b57bc42e712c77bd55fc4fc722cf93fe6c66 /lisp/gnus | |
| parent | 8992bc7d1b7e7babbf2899b5c45e84b486f504e6 (diff) | |
| parent | 37a4233a366797360c2f4f475591a3406586bcfb (diff) | |
| download | emacs-scratch/tsdh-vc-list-files.tar.gz | |
Merge remote-tracking branch 'origin/master' into scratch/tsdh-vc-list-filesscratch/tsdh-vc-list-files
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/gnus-start.el | 5 | ||||
| -rw-r--r-- | lisp/gnus/mm-decode.el | 8 | ||||
| -rw-r--r-- | lisp/gnus/mm-view.el | 5 |
3 files changed, 10 insertions, 8 deletions
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index e8775c66673..cb369f07b92 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -897,9 +897,8 @@ If REGEXP is given, lines that match it will be deleted." (set-buffer-modified-p t)) ;; Set the file modes to reflect the .newsrc file modes. (save-buffer) - (when (and (file-exists-p gnus-current-startup-file) - (file-exists-p dribble-file) - (setq modes (file-modes gnus-current-startup-file))) + (when (and (setq modes (file-modes gnus-current-startup-file)) + (file-exists-p dribble-file)) (gnus-set-file-modes dribble-file modes)) (goto-char (point-min)) (when (search-forward "Gnus was exited on purpose" nil t) diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index cba9633b539..5636b8eca47 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -381,9 +381,11 @@ enables you to choose manually one of two types those mails include." :type 'directory :group 'mime-display) -(defcustom mm-inline-large-images nil - "If t, then all images fit in the buffer. -If `resize', try to resize the images so they fit." +(defcustom mm-inline-large-images 'resize + "If nil, images larger than the window aren't displayed in the buffer. +If `resize', try to resize the images so they fit in the buffer. +If t, show the images as they are without resizing." + :version "27.1" :type '(radio (const :tag "Inline large images as they are." t) (const :tag "Resize large images." resize) diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 6ffa1fc168d..02d99200a35 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -65,8 +65,9 @@ :group 'mime-display) (defcustom mm-inline-large-images-proportion 0.9 - "Maximum proportion of large image resized when -`mm-inline-large-images' is set to resize." + "Maximum proportion large images can occupy in the buffer. +This is only used if `mm-inline-large-images' is set to +`resize'." :type 'float :version "24.1" :group 'mime-display) |