diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/cus-start.el | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e3b453edc09..f242386215a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-07 Martin Rudalics <rudalics@gmx.at> + + * cus-start.el (frame-resize-pixelwise): Fix group. + (frame-inhibit-implied-resize): Add entry. + 2014-11-07 Daiki Ueno <ueno@gnu.org> * epa.el (epa-pinentry-mode): New user option. diff --git a/lisp/cus-start.el b/lisp/cus-start.el index e0c1b73a465..3b8885a8717 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -274,7 +274,13 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (tool-bar-mode (frames mouse) boolean nil ; :initialize custom-initialize-default :set custom-set-minor-mode) - (frame-resize-pixelwise windows boolean "24.4") + (frame-resize-pixelwise frames boolean "24.4") + (frame-inhibit-implied-resize frames + (choice + (const :tag "Never" nil) + (const :tag "Always" t) + (repeat (symbol :tag "Parameter"))) + "25.1") ;; fringe.c (overflow-newline-into-fringe fringe boolean) ;; image.c |