diff options
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/ispell.el | 16 | ||||
| -rw-r--r-- | lisp/textmodes/org.el | 4 | ||||
| -rw-r--r-- | lisp/textmodes/tex-mode.el | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 4565d369371..13eda06c892 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -2764,6 +2764,15 @@ Point is placed at end of skipped region." string)) +(defun ispell-looking-at (string) + (let ((coding (ispell-get-coding-system)) + (len (length string))) + (and (<= (+ (point) len) (point-max)) + (equal (encode-coding-string string coding) + (encode-coding-string (buffer-substring-no-properties + (point) (+ (point) len)) + coding))))) + ;;; Avoid error messages when compiling for these dynamic variables. (eval-when-compile (defvar start) @@ -2812,12 +2821,7 @@ Returns the sum shift due to changes in word replacements." ;; Alignment cannot be tracked and this error will occur when ;; `query-replace' makes multiple corrections on the starting line. - (if (/= (+ word-len (point)) - (progn - ;; NB: Search can fail with Mule coding systems that don't - ;; display properly. Ignore the error in this case? - (search-forward (car poss) (+ word-len (point)) t) - (point))) + (or (ispell-looking-at (car poss)) ;; This occurs due to filter pipe problems (error (concat "Ispell misalignment: word " "`%s' point %d; probably incompatible versions") diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index 80ff7637365..1ff21ea1ce0 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el @@ -215,8 +215,8 @@ (defvar org-version "3.04" "The version number of the file org.el.") -(defun org-version (arg) - (interactive "P") +(defun org-version () + (interactive) (message "Org-mode version %s" org-version)) ;; The following two constants are for compatibility with different diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index 1f9336fef50..ee975c100b7 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1495,7 +1495,9 @@ Mark is left at original location." (make-comint "tex-shell" (or tex-shell-file-name (getenv "ESHELL") shell-file-name) - nil) + nil + ;; Specify an interactive shell, to make sure it prompts. + "-i") (let ((proc (get-process "tex-shell"))) (set-process-sentinel proc 'tex-shell-sentinel) (set-process-query-on-exit-flag proc nil) |