aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/x-win.el20
2 files changed, 14 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36941f109ac..a43da3785a1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-10-09 Juanma Barranquero <lekktu@gmail.com>
2
3 * term/x-win.el (x-alternatives-map): Remove spurious parenthesis.
4
12007-10-09 Stefan Monnier <monnier@iro.umontreal.ca> 52007-10-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * international/encoded-kb.el (encoded-kbd-setup-display): 7 * international/encoded-kb.el (encoded-kbd-setup-display):
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 7186e46c31a..3310bc5507e 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1195,7 +1195,7 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
1195 (define-key map [M-return] [?\M-\C-m]) 1195 (define-key map [M-return] [?\M-\C-m])
1196 (define-key map [M-escape] [?\M-\e]) 1196 (define-key map [M-escape] [?\M-\e])
1197 (define-key map [iso-lefttab] [backtab]) 1197 (define-key map [iso-lefttab] [backtab])
1198 (define-key map [S-iso-lefttab] [backtab])) 1198 (define-key map [S-iso-lefttab] [backtab])
1199 map) 1199 map)
1200 "Keymap of possible alternative meanings for some keys.") 1200 "Keymap of possible alternative meanings for some keys.")
1201 1201
@@ -2367,15 +2367,15 @@ order until succeed.")
2367 (cond;; check cut buffer 2367 (cond;; check cut buffer
2368 ((or (not cut-text) (string= cut-text "")) 2368 ((or (not cut-text) (string= cut-text ""))
2369 (setq x-last-selected-text-cut nil)) 2369 (setq x-last-selected-text-cut nil))
2370 ;; This short cut doesn't work because x-get-cut-buffer 2370 ;; This short cut doesn't work because x-get-cut-buffer
2371 ;; always returns a newly created string. 2371 ;; always returns a newly created string.
2372 ;; ((eq cut-text x-last-selected-text-cut) nil) 2372 ;; ((eq cut-text x-last-selected-text-cut) nil)
2373 ((and (string= cut-text x-last-selected-text-cut-encoded) 2373 ((and (string= cut-text x-last-selected-text-cut-encoded)
2374 (eq x-last-cut-buffer-coding next-coding)) 2374 (eq x-last-cut-buffer-coding next-coding))
2375 ;; See the comment above. No need of this recording. 2375 ;; See the comment above. No need of this recording.
2376 ;; Record the newer string, 2376 ;; Record the newer string,
2377 ;; so subsequent calls can use the `eq' test. 2377 ;; so subsequent calls can use the `eq' test.
2378 ;; (setq x-last-selected-text-cut cut-text) 2378 ;; (setq x-last-selected-text-cut cut-text)
2379 nil) 2379 nil)
2380 (t 2380 (t
2381 (setq x-last-selected-text-cut-encoded cut-text 2381 (setq x-last-selected-text-cut-encoded cut-text
@@ -2383,7 +2383,7 @@ order until succeed.")
2383 x-last-selected-text-cut 2383 x-last-selected-text-cut
2384 ;; ICCCM says cut buffer always contain ISO-Latin-1, but 2384 ;; ICCCM says cut buffer always contain ISO-Latin-1, but
2385 ;; use next-selection-coding-system if not nil. 2385 ;; use next-selection-coding-system if not nil.
2386 (decode-coding-string 2386 (decode-coding-string
2387 cut-text next-coding)))))) 2387 cut-text next-coding))))))
2388 2388
2389 ;; As we have done one selection, clear this now. 2389 ;; As we have done one selection, clear this now.
@@ -2509,7 +2509,7 @@ order until succeed.")
2509 (cons '(user-size . t) parsed)))) 2509 (cons '(user-size . t) parsed))))
2510 ;; All geometry parms apply to the initial frame. 2510 ;; All geometry parms apply to the initial frame.
2511 (setq initial-frame-alist (append initial-frame-alist parsed)) 2511 (setq initial-frame-alist (append initial-frame-alist parsed))
2512 ;; The size parms apply to all frames. Don't set it if there are 2512 ;; The size parms apply to all frames. Don't set it if there are
2513 ;; sizes there already (from command line). 2513 ;; sizes there already (from command line).
2514 (if (and (assq 'height parsed) 2514 (if (and (assq 'height parsed)
2515 (not (assq 'height default-frame-alist))) 2515 (not (assq 'height default-frame-alist)))