mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-23 07:19:15 +00:00
* textmodes/flyspell.el (flyspell-correct-word-before-point):
Don't create markers. (tex-mode-flyspell-verify): Don't create markers. Use line-end-position. (sgml-mode-flyspell-verify): Don't create markers. Simplify code using looking-at and looking-back.
This commit is contained in:
parent
e7deaab0bc
commit
873f4645aa
@ -1,3 +1,12 @@
|
||||
2009-04-16 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* textmodes/flyspell.el (flyspell-correct-word-before-point):
|
||||
Don't create markers.
|
||||
(tex-mode-flyspell-verify): Don't create markers. Use
|
||||
line-end-position.
|
||||
(sgml-mode-flyspell-verify): Don't create markers. Simplify code
|
||||
using looking-at and looking-back.
|
||||
|
||||
2009-04-16 Robert Brown <brown@google.com> (tiny change)
|
||||
|
||||
* emacs-lisp/lisp-mode.el: Give `deftype' a doc-string-elt
|
||||
|
@ -347,12 +347,12 @@ property of the major mode name.")
|
||||
(not (save-excursion
|
||||
(re-search-backward "^[ \t]*%%%[ \t]+Local" nil t)))
|
||||
(not (save-excursion
|
||||
(let ((this (point-marker))
|
||||
(e (progn (end-of-line) (point-marker))))
|
||||
(let ((this (point)))
|
||||
(beginning-of-line)
|
||||
(if (re-search-forward "\\\\\\(cite\\|label\\|ref\\){[^}]*}" e t)
|
||||
(and (>= this (match-beginning 0))
|
||||
(<= this (match-end 0)) )))))))
|
||||
(and (re-search-forward "\\\\\\(cite\\|label\\|ref\\){[^}]*}"
|
||||
(line-end-position) t)
|
||||
(>= this (match-beginning 0))
|
||||
(<= this (match-end 0))))))))
|
||||
|
||||
;;*--- sgml mode -------------------------------------------------------*/
|
||||
(put 'sgml-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify)
|
||||
@ -362,25 +362,10 @@ property of the major mode name.")
|
||||
(defun sgml-mode-flyspell-verify ()
|
||||
"Function used for `flyspell-generic-check-word-predicate' in SGML mode."
|
||||
(not (save-excursion
|
||||
(let ((this (point-marker))
|
||||
(s (progn (beginning-of-line) (point-marker)))
|
||||
(e (progn (end-of-line) (point-marker))))
|
||||
(or (progn
|
||||
(goto-char this)
|
||||
(and (re-search-forward "[^<]*>" e t)
|
||||
(= (match-beginning 0) this)))
|
||||
(progn
|
||||
(goto-char this)
|
||||
(and (re-search-backward "<[^>]*" s t)
|
||||
(= (match-end 0) this)))
|
||||
(and (progn
|
||||
(goto-char this)
|
||||
(and (re-search-forward "[^&]*;" e t)
|
||||
(= (match-beginning 0) this)))
|
||||
(progn
|
||||
(goto-char this)
|
||||
(and (re-search-backward "&[^;]*" s t)
|
||||
(= (match-end 0) this)))))))))
|
||||
(or (looking-at "[^<\n]*>")
|
||||
(looking-back "<[^>\n]*")
|
||||
(and (looking-at "[^&\n]*;")
|
||||
(looking-back "&[^;\n]*"))))))
|
||||
|
||||
;;*---------------------------------------------------------------------*/
|
||||
;;* Programming mode */
|
||||
@ -2063,7 +2048,7 @@ If OPOINT is non-nil, restore point there after adjusting it for replacement."
|
||||
(error "Pop-up menus do not work on this terminal"))
|
||||
;; use the correct dictionary
|
||||
(flyspell-accept-buffer-local-defs)
|
||||
(or opoint (setq opoint (point-marker)))
|
||||
(or opoint (setq opoint (point)))
|
||||
(let ((cursor-location (point))
|
||||
(word (flyspell-get-word nil)))
|
||||
(if (consp word)
|
||||
|
Loading…
Reference in New Issue
Block a user