Fix problems caused by new implementation of sub-word mode
* lisp/subr.el (forward-word-strictly, backward-word-strictly): New functions. (word-move-empty-char-table): New variable. * etc/NEWS: Mention 'forward-word-strictly' and 'backward-word-strictly'. * doc/lispref/positions.texi (Word Motion): Document 'find-word-boundary-function-table', 'forward-word-strictly', and 'backward-word-strictly'. (Bug#22560) * src/syntax.c (syms_of_syntax) <find-word-boundary-function-table>: Doc fix. * lisp/wdired.el (wdired-xcase-word): * lisp/textmodes/texnfo-upd.el (texinfo-copy-node-name) (texinfo-copy-section-title, texinfo-start-menu-description) (texinfo-copy-menu-title, texinfo-specific-section-type) (texinfo-insert-node-lines, texinfo-copy-next-section-title): * lisp/textmodes/texinfo.el (texinfo-clone-environment) (texinfo-insert-@end): * lisp/textmodes/texinfmt.el (texinfo-format-scan) (texinfo-anchor, texinfo-multitable-widths) (texinfo-multitable-item): * lisp/textmodes/tex-mode.el (latex-env-before-change): * lisp/textmodes/flyspell.el (texinfo-mode-flyspell-verify): * lisp/skeleton.el (skeleton-insert): * lisp/simple.el (count-words): * lisp/progmodes/vhdl-mode.el (vhdl-beginning-of-libunit) (vhdl-beginning-of-defun, vhdl-beginning-of-statement-1) (vhdl-update-sensitivity-list, vhdl-template-block) (vhdl-template-break, vhdl-template-case, vhdl-template-default) (vhdl-template-default-indent, vhdl-template-for-loop) (vhdl-template-if-then-use, vhdl-template-bare-loop) (vhdl-template-nature, vhdl-template-procedural) (vhdl-template-process, vhdl-template-selected-signal-asst) (vhdl-template-type, vhdl-template-variable) (vhdl-template-while-loop, vhdl-beginning-of-block) (vhdl-hooked-abbrev, vhdl-port-copy, vhdl-hs-forward-sexp-func): * lisp/progmodes/verilog-mode.el (verilog-backward-sexp) (verilog-forward-sexp, verilog-beg-of-statement) (verilog-set-auto-endcomments, verilog-backward-token) (verilog-do-indent): * lisp/progmodes/vera-mode.el (vera-guess-basic-syntax) (vera-indent-block-closing): * lisp/progmodes/simula.el (simula-context) (simula-backward-up-level, simula-forward-down-level) (simula-previous-statement, simula-next-statement) (simula-skip-comment-backward, simula-calculate-indent) (simula-find-if, simula-electric-keyword): * lisp/progmodes/sh-script.el (sh-smie--rc-newline-semi-p): * lisp/progmodes/ruby-mode.el (ruby-smie--redundant-do-p) (ruby-smie--forward-token, ruby-smie--backward-token) (ruby-singleton-class-p, ruby-calculate-indent) (ruby-forward-sexp, ruby-backward-sexp): * lisp/progmodes/ps-mode.el (ps-run-goto-error): * lisp/progmodes/perl-mode.el (perl-syntax-propertize-function) (perl-syntax-propertize-special-constructs) (perl-backward-to-start-of-continued-exp): * lisp/progmodes/pascal.el (pascal-indent-declaration): * lisp/progmodes/octave.el (octave-function-file-p): * lisp/progmodes/mantemp.el (mantemp-insert-cxx-syntax): * lisp/progmodes/js.el (js--forward-function-decl): * lisp/progmodes/idlwave.el (idlwave-show-begin-check) (idlwave-beginning-of-block, idlwave-end-of-block) (idlwave-block-jump-out, idlwave-determine-class): * lisp/progmodes/icon.el (icon-is-continuation-line) (icon-backward-to-start-of-continued-exp, end-of-icon-defun): * lisp/progmodes/hideif.el (hide-ifdef-define): * lisp/progmodes/f90.el (f90-change-keywords): * lisp/progmodes/cperl-mode.el (cperl-electric-pod) (cperl-linefeed, cperl-electric-terminator) (cperl-find-pods-heres, cperl-fix-line-spacing) (cperl-invert-if-unless): * lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur): * lisp/progmodes/cc-align.el (c-lineup-java-inher): * lisp/progmodes/ada-mode.el (ada-compile-goto-error) (ada-adjust-case-skeleton, ada-create-case-exception) (ada-create-case-exception-substring) (ada-case-read-exceptions-from-file, ada-after-keyword-p) (ada-scan-paramlist, ada-get-current-indent, ada-get-indent-end) (ada-get-indent-if, ada-get-indent-block-start) (ada-get-indent-loop, ada-get-indent-type) (ada-search-prev-end-stmt, ada-check-defun-name) (ada-goto-decl-start, ada-goto-matching-start) (ada-goto-matching-end, ada-looking-at-semi-or) (ada-looking-at-semi-private, ada-in-paramlist-p) (ada-search-ignore-complex-boolean, ada-move-to-start) (ada-move-to-end, ada-which-function, ada-gen-treat-proc): * lisp/net/quickurl.el (quickurl-grab-url): * lisp/mail/sendmail.el (mail-do-fcc): * lisp/mail/rmail.el (rmail-resend): * lisp/mail/mailabbrev.el (mail-abbrev-complete-alias): * lisp/mail/mail-extr.el (mail-extract-address-components): * lisp/json.el (json-read-keyword): * lisp/files.el (insert-directory): * lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): * lisp/completion.el (symbol-under-point, symbol-before-point) (symbol-before-point-for-complete, next-cdabbrev) (add-completions-from-c-buffer): * lisp/cedet/semantic/texi.el (semantic-up-context) (semantic-beginning-of-context): * lisp/cedet/semantic/bovine/el.el (semantic-get-local-variables): use 'forward-word-strictly' and 'backward-word-strictly' instead of 'forward-word' and 'backward-word'. [This reapplies commitc1d32a6537
, which was inadvertently lost by merge commitc71e7cc113
.]
This commit is contained in:
parent
22cd92a0f3
commit
7dba17670f
43 changed files with 313 additions and 221 deletions
|
@ -3470,7 +3470,7 @@ Use filename, if current buffer being edited shorten to just buffer name."
|
|||
(found nil)
|
||||
(st (point)))
|
||||
(if (not (looking-at "\\<"))
|
||||
(forward-word -1))
|
||||
(forward-word-strictly -1))
|
||||
(cond
|
||||
((verilog-skip-backward-comment-or-string))
|
||||
((looking-at "\\<else\\>")
|
||||
|
@ -3522,7 +3522,7 @@ Use filename, if current buffer being edited shorten to just buffer name."
|
|||
(st (point))
|
||||
(nest 'yes))
|
||||
(if (not (looking-at "\\<"))
|
||||
(forward-word -1))
|
||||
(forward-word-strictly -1))
|
||||
(cond
|
||||
((verilog-skip-forward-comment-or-string)
|
||||
(verilog-forward-syntactic-ws))
|
||||
|
@ -3545,11 +3545,11 @@ Use filename, if current buffer being edited shorten to just buffer name."
|
|||
(and (looking-at "fork")
|
||||
(progn
|
||||
(setq here (point)) ; sometimes a fork is just a fork
|
||||
(forward-word -1)
|
||||
(forward-word-strictly -1)
|
||||
(looking-at verilog-disable-fork-re))))
|
||||
(progn ; it is a disable fork; ignore it
|
||||
(goto-char (match-end 0))
|
||||
(forward-word 1)
|
||||
(forward-word-strictly 1)
|
||||
(setq reg nil))
|
||||
(progn ; it is a nice simple fork
|
||||
(goto-char here) ; return from looking for "disable fork"
|
||||
|
@ -3599,7 +3599,7 @@ Use filename, if current buffer being edited shorten to just buffer name."
|
|||
;; Search forward for matching endclocking
|
||||
(setq reg "\\(\\<clocking\\>\\)\\|\\(\\<endclocking\\>\\)" )))
|
||||
(if (and reg
|
||||
(forward-word 1))
|
||||
(forward-word-strictly 1))
|
||||
(catch 'skip
|
||||
(if (eq nest 'yes)
|
||||
(let ((depth 1)
|
||||
|
@ -3618,7 +3618,7 @@ Use filename, if current buffer being edited shorten to just buffer name."
|
|||
(looking-at verilog-disable-fork-re)
|
||||
(and (looking-at "fork")
|
||||
(progn
|
||||
(forward-word -1)
|
||||
(forward-word-strictly -1)
|
||||
(looking-at verilog-disable-fork-re))))
|
||||
(progn ; it is a disable fork; another false alarm
|
||||
(goto-char (match-end 0)))
|
||||
|
@ -4292,7 +4292,7 @@ Uses `verilog-scan' cache."
|
|||
;; stop if we see a named coverpoint
|
||||
(looking-at "\\w+\\W*:\\W*\\(coverpoint\\|cross\\|constraint\\)")
|
||||
;; keep going if we are in the middle of a word
|
||||
(not (or (looking-at "\\<") (forward-word -1)))
|
||||
(not (or (looking-at "\\<") (forward-word-strictly -1)))
|
||||
;; stop if we see an assertion (perhaps labeled)
|
||||
(and
|
||||
(looking-at "\\(\\w+\\W*:\\W*\\)?\\(\\<\\(assert\\|assume\\|cover\\)\\>\\s-+\\<property\\>\\)\\|\\(\\<assert\\>\\)")
|
||||
|
@ -4841,7 +4841,7 @@ primitive or interface named NAME."
|
|||
|
||||
((looking-at "\\<end\\>")
|
||||
;; HERE
|
||||
(forward-word 1)
|
||||
(forward-word-strictly 1)
|
||||
(verilog-forward-syntactic-ws)
|
||||
(setq err nil)
|
||||
(setq str (verilog-get-expr))
|
||||
|
@ -5956,7 +5956,7 @@ Set point to where line starts."
|
|||
(verilog-backward-up-list 1)
|
||||
(verilog-backward-syntactic-ws)
|
||||
(let ((back (point)))
|
||||
(forward-word -1)
|
||||
(forward-word-strictly -1)
|
||||
(cond
|
||||
;;XX
|
||||
((looking-at "\\<\\(always\\(_latch\\|_ff\\|_comb\\)?\\|case\\(\\|[xz]\\)\\|for\\(\\|each\\|ever\\)\\|i\\(f\\|nitial\\)\\|repeat\\|while\\)\\>")
|
||||
|
@ -5997,11 +5997,11 @@ Set point to where line starts."
|
|||
|
||||
(;-- any of begin|initial|while are complete statements; 'begin : foo' is also complete
|
||||
t
|
||||
(forward-word -1)
|
||||
(forward-word-strictly -1)
|
||||
(while (or (= (preceding-char) ?\_)
|
||||
(= (preceding-char) ?\@)
|
||||
(= (preceding-char) ?\.))
|
||||
(forward-word -1))
|
||||
(forward-word-strictly -1))
|
||||
(cond
|
||||
((looking-at "\\<else\\>")
|
||||
t)
|
||||
|
@ -6515,7 +6515,7 @@ Only look at a few lines to determine indent level."
|
|||
(= (following-char) ?\`))
|
||||
(progn
|
||||
(forward-char 1)
|
||||
(forward-word 1)
|
||||
(forward-word-strictly 1)
|
||||
(skip-chars-forward " \t")))
|
||||
((= (following-char) ?\[)
|
||||
(progn
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue