[Emacs-diffs] trunk r117084: * lisp/emacs-lisp/lisp-mode.el (preceding-sexp): Exclude leading ", " which

[Stefan Monnier]

------------------------------------------------------------
revno: 117084
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sat 2014-05-10 23:48:15 -0400
message:
  * lisp/emacs-lisp/lisp-mode.el (preceding-sexp): Exclude leading "," which
  are a hindrance for C-x C-e.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/lisp-mode.el   lispmode.el-20091113204419-o5vbwnq5f7feedwu-205

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-11 01:39:49 +0000
+++ b/lisp/ChangeLog    2014-05-11 03:48:15 +0000
@@ -1,3 +1,8 @@
+2014-05-11  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/lisp-mode.el (preceding-sexp): Exclude leading "," which
+       are a hindrance for C-x C-e.
+
 2014-05-11  Leo Liu  <address@hidden>
 
        * net/rcirc.el (rcirc-sentinel): Fix last change.

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el      2014-05-01 16:14:03 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el      2014-05-11 03:48:15 +0000
@@ -1017,26 +1017,20 @@
              (forward-sexp -1))))
 
        (save-restriction
-         ;; address@hidden 30-Jul-1997: skip ` in
-         ;; `variable' so that the value is returned, not the
-         ;; name
-         (if (and ignore-quotes
-                  (eq (following-char) ?`))
+         (if (and ignore-quotes (eq (following-char) ?`))
+              ;; address@hidden 30-Jul-1997: Skip ` in `variable' so
+              ;; that the value is returned, not the name.
              (forward-char))
+          (when (looking-at ",@?") (goto-char (match-end 0)))
          (narrow-to-region (point-min) opoint)
          (setq expr (read (current-buffer)))
-         ;; If it's an (interactive ...) form, it's more
-         ;; useful to show how an interactive call would
-         ;; use it.
-         (and (consp expr)
-              (eq (car expr) 'interactive)
+          ;; If it's an (interactive ...) form, it's more useful to show how an
+          ;; interactive call would use it.
+          ;; FIXME: Is it really the right place for this?
+          (when (eq (car-safe expr) 'interactive)
               (setq expr
-                    (list 'call-interactively
-                          (list 'quote
-                                (list 'lambda
-                                      '(&rest args)
-                                      expr
-                                      'args)))))
+                  `(call-interactively
+                    (lambda (&rest args) ,expr args))))
          expr)))))