aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2015-08-15 08:35:02 -0700
committerPaul Eggert2015-08-15 08:35:36 -0700
commit692cf1013b8354f9f7a17ebb5e6e39b76ddce414 (patch)
treebfd2e16af2a1ef3af84069c04a0f168e8dae4286 /lisp
parent2f30f8efb8e311c5fcd6c9d896bad5b6f703c3f1 (diff)
downloademacs-692cf1013b8354f9f7a17ebb5e6e39b76ddce414.tar.gz
emacs-692cf1013b8354f9f7a17ebb5e6e39b76ddce414.zip
Fix "\`" confusion in Lisp strings
* admin/authors.el (authors-canonical-author-name): Fix typo by using "\\`" not "\`" in string RE. * lisp/obsolete/complete.el (PC-complete-as-file-name): * lisp/obsolete/vi.el (vi-backward-blank-delimited-word): * lisp/progmodes/verilog-mode.el (verilog-mode-map): Use plain "`", not the equivalent-but-confusing "\`", in strings. * lisp/textmodes/texinfmt.el: Fix comment likewise.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/obsolete/complete.el2
-rw-r--r--lisp/obsolete/vi.el2
-rw-r--r--lisp/progmodes/verilog-mode.el8
-rw-r--r--lisp/textmodes/texinfmt.el2
4 files changed, 7 insertions, 7 deletions
diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el
index 7c7582f80d9..87dedacbe1d 100644
--- a/lisp/obsolete/complete.el
+++ b/lisp/obsolete/complete.el
@@ -963,7 +963,7 @@ or properties are considered."
963 Environment vars are converted to their values." 963 Environment vars are converted to their values."
964 (interactive) 964 (interactive)
965 (let* ((end (point)) 965 (let* ((end (point))
966 (beg (if (re-search-backward "[^\\][ \t\n\"\`\'][^ \t\n\"\`\']" 966 (beg (if (re-search-backward "[^\\][ \t\n\"`'][^ \t\n\"`']"
967 (point-min) t) 967 (point-min) t)
968 (+ (point) 2) 968 (+ (point) 2)
969 (point-min))) 969 (point-min)))
diff --git a/lisp/obsolete/vi.el b/lisp/obsolete/vi.el
index fbdf7a1e920..c5dc0efd706 100644
--- a/lisp/obsolete/vi.el
+++ b/lisp/obsolete/vi.el
@@ -1213,7 +1213,7 @@ SPECIAL FEATURE: char argument can be used to specify shift amount(1-9)."
1213(defun vi-backward-blank-delimited-word (count) 1213(defun vi-backward-blank-delimited-word (count)
1214 "Backward COUNT blank-delimited words." 1214 "Backward COUNT blank-delimited words."
1215 (interactive "p") 1215 (interactive "p")
1216 (if (re-search-backward "[ \t\n\`][^ \t\n\`]+" nil t count) 1216 (if (re-search-backward "[ \t\n`][^ \t\n`]+" nil t count)
1217 (if (not (bobp)) (forward-char 1)))) 1217 (if (not (bobp)) (forward-char 1))))
1218 1218
1219(defun vi-forward-blank-delimited-word (count) 1219(defun vi-forward-blank-delimited-word (count)
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 4fc4b03688f..93572d9e64e 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -1336,7 +1336,7 @@ If set will become buffer local.")
1336 (define-key map [(control 59)] 'electric-verilog-semi-with-comment) 1336 (define-key map [(control 59)] 'electric-verilog-semi-with-comment)
1337 (define-key map ":" 'electric-verilog-colon) 1337 (define-key map ":" 'electric-verilog-colon)
1338 ;;(define-key map "=" 'electric-verilog-equal) 1338 ;;(define-key map "=" 'electric-verilog-equal)
1339 (define-key map "\`" 'electric-verilog-tick) 1339 (define-key map "`" 'electric-verilog-tick)
1340 (define-key map "\t" 'electric-verilog-tab) 1340 (define-key map "\t" 'electric-verilog-tab)
1341 (define-key map "\r" 'electric-verilog-terminate-line) 1341 (define-key map "\r" 'electric-verilog-terminate-line)
1342 ;; backspace/delete key bindings 1342 ;; backspace/delete key bindings
@@ -1350,9 +1350,9 @@ If set will become buffer local.")
1350 (define-key map "\M-\t" 'verilog-complete-word) 1350 (define-key map "\M-\t" 'verilog-complete-word)
1351 (define-key map "\M-?" 'verilog-show-completions) 1351 (define-key map "\M-?" 'verilog-show-completions)
1352 ;; Note \C-c and letter are reserved for users 1352 ;; Note \C-c and letter are reserved for users
1353 (define-key map "\C-c\`" 'verilog-lint-off) 1353 (define-key map "\C-c`" 'verilog-lint-off)
1354 (define-key map "\C-c\*" 'verilog-delete-auto-star-implicit) 1354 (define-key map "\C-c*" 'verilog-delete-auto-star-implicit)
1355 (define-key map "\C-c\?" 'verilog-diff-auto) 1355 (define-key map "\C-c?" 'verilog-diff-auto)
1356 (define-key map "\C-c\C-r" 'verilog-label-be) 1356 (define-key map "\C-c\C-r" 'verilog-label-be)
1357 (define-key map "\C-c\C-i" 'verilog-pretty-declarations) 1357 (define-key map "\C-c\C-i" 'verilog-pretty-declarations)
1358 (define-key map "\C-c=" 'verilog-pretty-expr) 1358 (define-key map "\C-c=" 'verilog-pretty-expr)
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index e1259ff94f6..8e4a7e9186d 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -3127,7 +3127,7 @@ Default is to leave paragraph indentation as is."
3127;; (put '\` 'texinfo-format 'texinfo-format-grave-accent) 3127;; (put '\` 'texinfo-format 'texinfo-format-grave-accent)
3128;; (defun texinfo-format-grave-accent () 3128;; (defun texinfo-format-grave-accent ()
3129;; (texinfo-discard-command) 3129;; (texinfo-discard-command)
3130;; (insert "\`")) 3130;; (insert "`"))
3131;; 3131;;
3132;; @' ==> ' acute accent 3132;; @' ==> ' acute accent
3133;; (put '\' 'texinfo-format 'texinfo-format-acute-accent) 3133;; (put '\' 'texinfo-format 'texinfo-format-acute-accent)