aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2006-09-16 17:41:59 +0000
committerJan Djärv2006-09-16 17:41:59 +0000
commitb1707a95e42352f260c266343f8ec264d343dd71 (patch)
tree588c307940509e9b272f378e7a7172b5c008d215
parent241ad3cab7ffbeaf83e724f639750714af60b192 (diff)
downloademacs-b1707a95e42352f260c266343f8ec264d343dd71.tar.gz
emacs-b1707a95e42352f260c266343f8ec264d343dd71.zip
* cus-start.el (all): Add x-gtk-show-chooser-help-text.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/cus-start.el1
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd291081b9d..4e749d12140 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12006-09-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 12006-09-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 2
3 * cus-start.el (all): Add x-gtk-show-chooser-help-text.
4
3 * select.el (xselect-convert-to-string): If UTF8_STRING is requested 5 * select.el (xselect-convert-to-string): If UTF8_STRING is requested
4 and the data doesn't look like UTF8, send STRING instead. 6 and the data doesn't look like UTF8, send STRING instead.
5 7
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 77980d726e5..52471e979a6 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -373,6 +373,7 @@ since it could result in memory overflow and make Emacs crash."
373 (repeat (directory :format "%v"))) 373 (repeat (directory :format "%v")))
374 (x-use-old-gtk-file-dialog menu boolean "22.1") 374 (x-use-old-gtk-file-dialog menu boolean "22.1")
375 (x-gtk-show-hidden-files menu boolean "22.1") 375 (x-gtk-show-hidden-files menu boolean "22.1")
376 (x-gtk-show-chooser-help-text menu boolean "22.1")
376 (x-gtk-whole-detached-tool-bar x boolean "22.1") 377 (x-gtk-whole-detached-tool-bar x boolean "22.1")
377 ;; xterm.c 378 ;; xterm.c
378 (x-use-underline-position-properties display boolean "22.1") 379 (x-use-underline-position-properties display boolean "22.1")