summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2015-09-07 22:05:04 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2015-09-07 22:05:04 -0400
commit6cd64aaf1317bdd96f29fa2a7c3d49172e79bc37 (patch)
tree9c1bebfdaf35c54a62928f93cbc3f0e0c4c721b4 /lisp
parent6afef3f6ca2f3009c722b84e249903b7f807b044 (diff)
downloademacs-6cd64aaf1317bdd96f29fa2a7c3d49172e79bc37.tar.gz
(electric-quote-mode): Activate everywhere in message-mode
* lisp/electric.el (electric-quote-post-self-insert-function): Don't use syntax-ppss if comment-use-syntax is nil (e.g. message-mode).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/electric.el2
-rw-r--r--lisp/net/tramp.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/electric.el b/lisp/electric.el
index 4f2400825d7..47cb020108c 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -439,7 +439,7 @@ This requotes when a quoting key is typed."
(when (and electric-quote-mode
(memq last-command-event '(?\' ?\`)))
(let ((start
- (if comment-start
+ (if (and comment-start comment-use-syntax)
(when (or electric-quote-comment electric-quote-string)
(let ((syntax (syntax-ppss)))
(and (or (and electric-quote-comment (nth 4 syntax))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c16384a6c6c..0969048c433 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3615,7 +3615,7 @@ This is needed in order to hide `last-coding-system-used', which is set
for process communication also."
(with-current-buffer (process-buffer proc)
;; FIXME: If there is a gateway process, we need communication
- ;; between several processes. Too complicate to implement, so we
+ ;; between several processes. Too complicated to implement, so we
;; read output from all processes.
(let ((p (if (tramp-get-connection-property proc "gateway" nil) nil proc))
buffer-read-only last-coding-system-used)