From 32073b07e374f15f967ff683e60602d25851c569 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Mon, 17 Jan 2005 10:18:56 +0000 Subject: (org-version): Unnecessary prefix arg removed. --- lisp/textmodes/org.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/textmodes') 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 -- cgit v1.2.3 From 4042dc25935c1dcfae0863cd833982562deb1dc2 Mon Sep 17 00:00:00 2001 From: Steven Tamm Date: Mon, 17 Jan 2005 17:32:30 +0000 Subject: * textmodes/tex-mode.el (tex-start-shell): Adding -i to the tex-shell cause to force interactivity when using pipes. --- lisp/ChangeLog | 5 +++++ lisp/textmodes/tex-mode.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'lisp/textmodes') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index efc80316d14..29f41e413e5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-01-17 Steven Tamm + + * textmodes/tex-mode.el (tex-start-shell): Adding -i to the + tex-shell cause to force interactivity when using pipes. + 2005-01-17 Kim F. Storm * simple.el (just-one-space): Make arg optional. diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index bac2ed6f800..51be21527d6 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1495,7 +1495,8 @@ Mark is left at original location." (make-comint "tex-shell" (or tex-shell-file-name (getenv "ESHELL") shell-file-name) - nil) + nil + "-i") (let ((proc (get-process "tex-shell"))) (set-process-sentinel proc 'tex-shell-sentinel) (set-process-query-on-exit-flag proc nil) -- cgit v1.2.3 From 053be11a8844e0dbc448e7b9a977fb815b438c2f Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 17 Jan 2005 23:49:20 +0000 Subject: Comment change. --- lisp/textmodes/tex-mode.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/textmodes') diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index 51be21527d6..ce34138d5fb 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1496,6 +1496,7 @@ Mark is left at original location." "tex-shell" (or tex-shell-file-name (getenv "ESHELL") shell-file-name) nil + ;; Specify an interactive shell, to make sure it prompts. "-i") (let ((proc (get-process "tex-shell"))) (set-process-sentinel proc 'tex-shell-sentinel) -- cgit v1.2.3 From 664ca704c3342cf3de365d70646730224fd7902c Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 18 Jan 2005 23:20:18 +0000 Subject: (ispell-looking-at): New function. (ispell-process-line): Use ispell-looking-at to compare the ispell output and the buffer contents. --- lisp/ChangeLog | 6 ++++++ lisp/textmodes/ispell.el | 18 +++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) (limited to 'lisp/textmodes') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 11485d19251..ed93ba934f6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2005-01-19 Kenichi Handa + + * textmodes/ispell.el (ispell-looking-at): New function. + (ispell-process-line): Use ispell-looking-at to compare the ispell + output and the buffer contents. + 2005-01-18 Jay Belanger * calc/calc.el (calc-display-raw): Fix docstring. diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 0c4aeb1bd24..2e8b1ab93c6 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -1091,7 +1091,7 @@ Protects against bogus binding of `enable-multibyte-characters' in XEmacs." table)) ;; Return a string decoded from Nth element of the current dictionary -;; while splice equivalent characters into the string. This splicing +;; while splicing equivalent characters into the string. This splicing ;; is done only if the string is a regular expression of the form ;; "[...]" because, otherwise, splicing will result in incorrect ;; regular expression matching. @@ -2794,6 +2794,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) @@ -2842,12 +2851,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") -- cgit v1.2.3