[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/lisp-mode.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/lisp-mode.el [lexbind] |
Date: |
Sat, 04 Sep 2004 05:40:47 -0400 |
Index: emacs/lisp/emacs-lisp/lisp-mode.el
diff -c emacs/lisp/emacs-lisp/lisp-mode.el:1.134.4.10
emacs/lisp/emacs-lisp/lisp-mode.el:1.134.4.11
*** emacs/lisp/emacs-lisp/lisp-mode.el:1.134.4.10 Sat Sep 4 09:24:35 2004
--- emacs/lisp/emacs-lisp/lisp-mode.el Sat Sep 4 09:28:13 2004
***************
*** 363,369 ****
(when (stringp default)
(if (string-match ":+" default)
(substring default (match-end 0))
! default))))
;; Used in old LispM code.
(defalias 'common-lisp-mode 'lisp-mode)
--- 363,369 ----
(when (stringp default)
(if (string-match ":+" default)
(substring default (match-end 0))
! default))))
;; Used in old LispM code.
(defalias 'common-lisp-mode 'lisp-mode)
***************
*** 459,479 ****
If CHAR is not a character, return nil."
(and (integerp char)
(eventp char)
! (let ((c (event-basic-type char)))
! (concat
! "?"
! (mapconcat
! (lambda (modif)
! (cond ((eq modif 'super) "\\s-")
! (t (string ?\\ (upcase (aref (symbol-name modif) 0)) ?-))))
! (event-modifiers char) "")
! (cond
! ((memq c '(?\; ?\( ?\) ?\{ ?\} ?\[ ?\] ?\" ?\' ?\\)) (string ?\\ c))
! ((eq c 127) "\\C-?")
! (t
! (condition-case nil
! (string c)
! (error nil))))))))
(defun eval-last-sexp-1 (eval-last-sexp-arg-internal)
"Evaluate sexp before point; print value in minibuffer.
--- 459,495 ----
If CHAR is not a character, return nil."
(and (integerp char)
(eventp char)
! (let ((c (event-basic-type char))
! (mods (event-modifiers char))
! string)
! ;; Prevent ?A from turning into ?\S-a.
! (if (and (memq 'shift mods)
! (zerop (logand char ?\S-\^@))
! (not (let ((case-fold-search nil))
! (char-equal c (upcase c)))))
! (setq c (upcase c) mods nil))
! ;; What string are we considering using?
! (condition-case nil
! (setq string
! (concat
! "?"
! (mapconcat
! (lambda (modif)
! (cond ((eq modif 'super) "\\s-")
! (t (string ?\\ (upcase (aref (symbol-name modif)
0)) ?-))))
! mods "")
! (cond
! ((memq c '(?\; ?\( ?\) ?\{ ?\} ?\[ ?\] ?\" ?\' ?\\))
(string ?\\ c))
! ((eq c 127) "\\C-?")
! (t
! (string c)))))
! (error nil))
! ;; Verify the string reads a CHAR, not to some other character.
! ;; If it doesn't, return nil instead.
! (and string
! (= (car (read-from-string string)) char)
! string))))
!
(defun eval-last-sexp-1 (eval-last-sexp-arg-internal)
"Evaluate sexp before point; print value in minibuffer.