aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero2008-06-01 11:54:47 +0000
committerJuanma Barranquero2008-06-01 11:54:47 +0000
commit29128339b10f86b7bf65e6cdf680cad737b8a585 (patch)
tree2f9a1d12e040d45c1673c9f2078daaef0425238f /lisp
parentf2cec7a9907796d97bbe4f99ce00d1866b773dfb (diff)
downloademacs-29128339b10f86b7bf65e6cdf680cad737b8a585.tar.gz
emacs-29128339b10f86b7bf65e6cdf680cad737b8a585.zip
(x-get-selection): Fix typo.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/select.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05ff2258377..45e1ea91138 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-06-01 Thomas Morgan <tlm@thomasmorgan.net> (tiny change)
2
3 * select.el (x-get-selection): Fix typo.
4
12008-06-01 Juanma Barranquero <lekktu@gmail.com> 52008-06-01 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * descr-text.el (describe-text-sexp): Use `string-match-p'. Simplify. 7 * descr-text.el (describe-text-sexp): Use `string-match-p'. Simplify.
diff --git a/lisp/select.el b/lisp/select.el
index fb2eedf7f9c..c6128169921 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -88,7 +88,7 @@ in `selection-converter-alist', which see."
88 selection-coding-system 88 selection-coding-system
89 (cond ((eq data-type 'UTF8_STRING) 89 (cond ((eq data-type 'UTF8_STRING)
90 'utf-8) 90 'utf-8)
91 ((eq data-type 'COMPOUND-TEXT) 91 ((eq data-type 'COMPOUND_TEXT)
92 'compound-text-with-extensions) 92 'compound-text-with-extensions)
93 ((eq data-type 'C_STRING) 93 ((eq data-type 'C_STRING)
94 nil) 94 nil)