[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 692cf10: Fix "\`" confusion in Lisp strings
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 692cf10: Fix "\`" confusion in Lisp strings |
Date: |
Sat, 15 Aug 2015 15:35:49 +0000 |
branch: master
commit 692cf1013b8354f9f7a17ebb5e6e39b76ddce414
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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.
---
admin/authors.el | 2 +-
lisp/obsolete/complete.el | 2 +-
lisp/obsolete/vi.el | 2 +-
lisp/progmodes/verilog-mode.el | 8 ++++----
lisp/textmodes/texinfmt.el | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/admin/authors.el b/admin/authors.el
index c7ec3bc..547e046 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -1154,7 +1154,7 @@ it is found in `authors-fixed-case'."
(setq regexps (cdr regexps))))))
(when author
(setq author (replace-regexp-in-string "[ \t]*[(<].*$" "" author))
- (setq author (replace-regexp-in-string "\`[ \t]+" "" author))
+ (setq author (replace-regexp-in-string "\\`[ \t]+" "" author))
(setq author (replace-regexp-in-string "[ \t]+$" "" author))
(setq author (replace-regexp-in-string "[ \t]+" " " author))
(unless (string-match "[-, \t]" author)
diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el
index 7c7582f..87dedac 100644
--- a/lisp/obsolete/complete.el
+++ b/lisp/obsolete/complete.el
@@ -963,7 +963,7 @@ or properties are considered."
Environment vars are converted to their values."
(interactive)
(let* ((end (point))
- (beg (if (re-search-backward "[^\\][ \t\n\"\`\'][^ \t\n\"\`\']"
+ (beg (if (re-search-backward "[^\\][ \t\n\"`'][^ \t\n\"`']"
(point-min) t)
(+ (point) 2)
(point-min)))
diff --git a/lisp/obsolete/vi.el b/lisp/obsolete/vi.el
index fbdf7a1..c5dc0ef 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)."
(defun vi-backward-blank-delimited-word (count)
"Backward COUNT blank-delimited words."
(interactive "p")
- (if (re-search-backward "[ \t\n\`][^ \t\n\`]+" nil t count)
+ (if (re-search-backward "[ \t\n`][^ \t\n`]+" nil t count)
(if (not (bobp)) (forward-char 1))))
(defun vi-forward-blank-delimited-word (count)
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 4fc4b03..93572d9 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -1336,7 +1336,7 @@ If set will become buffer local.")
(define-key map [(control 59)] 'electric-verilog-semi-with-comment)
(define-key map ":" 'electric-verilog-colon)
;;(define-key map "=" 'electric-verilog-equal)
- (define-key map "\`" 'electric-verilog-tick)
+ (define-key map "`" 'electric-verilog-tick)
(define-key map "\t" 'electric-verilog-tab)
(define-key map "\r" 'electric-verilog-terminate-line)
;; backspace/delete key bindings
@@ -1350,9 +1350,9 @@ If set will become buffer local.")
(define-key map "\M-\t" 'verilog-complete-word)
(define-key map "\M-?" 'verilog-show-completions)
;; Note \C-c and letter are reserved for users
- (define-key map "\C-c\`" 'verilog-lint-off)
- (define-key map "\C-c\*" 'verilog-delete-auto-star-implicit)
- (define-key map "\C-c\?" 'verilog-diff-auto)
+ (define-key map "\C-c`" 'verilog-lint-off)
+ (define-key map "\C-c*" 'verilog-delete-auto-star-implicit)
+ (define-key map "\C-c?" 'verilog-diff-auto)
(define-key map "\C-c\C-r" 'verilog-label-be)
(define-key map "\C-c\C-i" 'verilog-pretty-declarations)
(define-key map "\C-c=" 'verilog-pretty-expr)
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index e1259ff..8e4a7e9 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -3127,7 +3127,7 @@ Default is to leave paragraph indentation as is."
;; (put '\` 'texinfo-format 'texinfo-format-grave-accent)
;; (defun texinfo-format-grave-accent ()
;; (texinfo-discard-command)
-;; (insert "\`"))
+;; (insert "`"))
;;
;; @' ==> ' acute accent
;; (put '\' 'texinfo-format 'texinfo-format-acute-accent)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 692cf10: Fix "\`" confusion in Lisp strings,
Paul Eggert <=