diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/cus-start.el | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a000728239c..afb6f696712 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-10-18 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2014-10-18 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * cus-start.el (x-gtk-whole-detached-tool-bar): Remove. | ||
| 4 | |||
| 3 | * term/x-win.el (x-gtk-stock-map): Add icon names suggested as | 5 | * term/x-win.el (x-gtk-stock-map): Add icon names suggested as |
| 4 | replacements to stock names before stock names in a list. | 6 | replacements to stock names before stock names in a list. |
| 5 | Cdr may be a list, each name is tried in turn until one is found. | 7 | Cdr may be a list, each name is tried in turn until one is found. |
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index d4795bfe6a5..e0c1b73a465 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el | |||
| @@ -522,7 +522,6 @@ since it could result in memory overflow and make Emacs crash." | |||
| 522 | (x-gtk-use-old-file-dialog menu boolean "22.1") | 522 | (x-gtk-use-old-file-dialog menu boolean "22.1") |
| 523 | (x-gtk-show-hidden-files menu boolean "22.1") | 523 | (x-gtk-show-hidden-files menu boolean "22.1") |
| 524 | (x-gtk-file-dialog-help-text menu boolean "22.1") | 524 | (x-gtk-file-dialog-help-text menu boolean "22.1") |
| 525 | (x-gtk-whole-detached-tool-bar x boolean "22.1") | ||
| 526 | (x-gtk-use-system-tooltips tooltip boolean "23.3") | 525 | (x-gtk-use-system-tooltips tooltip boolean "23.3") |
| 527 | ;; xterm.c | 526 | ;; xterm.c |
| 528 | (x-use-underline-position-properties display boolean "22.1") | 527 | (x-use-underline-position-properties display boolean "22.1") |