diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/files.el | 2 | ||||
| -rw-r--r-- | lisp/mouse.el | 10 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/vhdl-mode.el | 2 | ||||
| -rw-r--r-- | lisp/subr.el | 4 | ||||
| -rw-r--r-- | lisp/view.el | 2 |
6 files changed, 15 insertions, 7 deletions
diff --git a/lisp/files.el b/lisp/files.el index db274e2782d..4610c0a11e0 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -6210,7 +6210,7 @@ and `list-directory-verbose-switches'." PATTERN is assumed to represent a file-name wildcard suitable for the underlying filesystem. For Unix and GNU/Linux, each character from the -set [ \\t\\n;<>&|()`'\"#$] is quoted with a backslash; for DOS/Windows, all +set [ \\t\\n;<>&|()\\=`\\='\"#$] is quoted with a backslash; for DOS/Windows, all the parts of the pattern which don't include wildcard characters are quoted with double quotes. diff --git a/lisp/mouse.el b/lisp/mouse.el index 3e3708a2e0d..0be17b48cac 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -415,7 +415,15 @@ must be one of the symbols `header', `mode', or `vertical'." (or (not resize-mini-windows) (eq minibuffer-window (active-minibuffer-window))))))) - (setq draggable nil)))) + (setq draggable nil))) + ((eq line 'vertical) + (let ((divider-width (frame-right-divider-width frame))) + (when (and (or (not (numberp divider-width)) + (zerop divider-width)) + (eq (cdr (assq 'vertical-scroll-bars + (frame-parameters frame))) + 'left)) + (setq window (window-in-direction 'left window t)))))) (let* ((exitfun nil) (move diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index cd3b04de712..d75edbc84ef 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1151,7 +1151,7 @@ delimiter." ((looking-at "<<") (cond ((and (ruby-expr-beg 'heredoc) - (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)")) + (looking-at "<<\\([-~]\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)")) (setq re (regexp-quote (or (match-string 4) (match-string 2)))) (if (match-beginning 1) (setq re (concat "\\s *" re))) (let* ((id-end (goto-char (match-end 0))) diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index a390494ebf5..0756c790495 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -4684,7 +4684,7 @@ Usage: SPECIAL MENUES: As an alternative to the speedbar, an index menu can be added (set option `vhdl-index-menu' to non-nil) or made accessible as a mouse menu - (e.g. add \"(global-set-key '[S-down-mouse-3] 'imenu)\" to your start-up + (e.g. add \"(global-set-key [S-down-mouse-3] \\='imenu)\" to your start-up file) for browsing the file contents (is not populated if buffer is larger than 256000). Also, a source file menu can be added (set option `vhdl-source-file-menu' to non-nil) for browsing the diff --git a/lisp/subr.el b/lisp/subr.el index b66ff288b7a..358bfa5e1c0 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3954,9 +3954,9 @@ the match data are the result of matching REGEXP against a substring of STRING, the same substring that is the actual text of the match which is passed to REP as its argument. -To replace only the first match (if any), make REGEXP match up to \\' +To replace only the first match (if any), make REGEXP match up to \\\\=' and replace a sub-expression, e.g. - (replace-regexp-in-string \"\\\\(foo\\\\).*\\\\'\" \"bar\" \" foo foo\" nil nil 1) + (replace-regexp-in-string \"\\\\(foo\\\\).*\\\\\\='\" \"bar\" \" foo foo\" nil nil 1) => \" bar foo\"" ;; To avoid excessive consing from multiple matches in long strings, diff --git a/lisp/view.el b/lisp/view.el index 830073a0639..ff7d2c9deb1 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -429,7 +429,7 @@ x exchanges point and mark. Mark ring is pushed at start of every successful search and when jump to line occurs. The mark is set on jump to buffer start or end. \\[point-to-register] save current position in character register. -' go to position saved in character register. +\\=' go to position saved in character register. s do forward incremental search. r do reverse incremental search. \\[View-search-regexp-forward] searches forward for regular expression, starting after current page. |