[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/info.el
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/info.el |
Date: |
Mon, 22 Aug 2005 15:53:47 -0400 |
Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.444 emacs/lisp/info.el:1.445
*** emacs/lisp/info.el:1.444 Sun Aug 14 23:44:01 2005
--- emacs/lisp/info.el Mon Aug 22 19:53:46 2005
***************
*** 1076,1082 ****
;; Insert the entire original dir file as a start; note that we've
;; already saved its default directory to use as the default
;; directory for the whole concatenation.
! (goto-char (prog1 (point) (insert-buffer-substring buffer)))
;; Look at each of the other buffers one by one.
(dolist (other others)
--- 1076,1082 ----
;; Insert the entire original dir file as a start; note that we've
;; already saved its default directory to use as the default
;; directory for the whole concatenation.
! (save-excursion (insert-buffer-substring buffer))
;; Look at each of the other buffers one by one.
(dolist (other others)
***************
*** 1770,1778 ****
(lambda (string &optional bound noerror count)
(if isearch-word
(Info-search (concat "\\b" (replace-regexp-in-string
! "\\W+" "\\\\W+"
(replace-regexp-in-string
! "^\\W+\\|\\W+$" "" string)) "\\b")
bound noerror count
(unless isearch-forward 'backward))
(Info-search (if isearch-regexp string (regexp-quote string))
--- 1770,1780 ----
(lambda (string &optional bound noerror count)
(if isearch-word
(Info-search (concat "\\b" (replace-regexp-in-string
! "\\W+" "\\W+"
(replace-regexp-in-string
! "^\\W+\\|\\W+$" "" string)
! nil t)
! "\\b")
bound noerror count
(unless isearch-forward 'backward))
(Info-search (if isearch-regexp string (regexp-quote string))
***************
*** 3585,3611 ****
(t
(Info-goto-emacs-command-node command)))))
- (defun Info-escape-percent (string)
- "Double all occurrences of `%' in STRING.
-
- Return a new string with all `%' characters replaced by `%%'.
- Preserve text properties."
- (let ((start 0)
- (end (length string))
- mb me m matches)
- (save-match-data
- (while (and (< start end) (string-match "%" string start))
- (setq mb (match-beginning 0)
- me (1+ mb)
- m (substring string mb me)
- matches (cons m
- (cons m
- (cons (substring string start mb)
- matches)))
- start me))
- (push (substring string start end) matches)
- (apply #'concat (nreverse matches)))))
-
(defvar Info-next-link-keymap
(let ((keymap (make-sparse-keymap)))
(define-key keymap [header-line mouse-1] 'Info-next)
--- 3587,3592 ----
***************
*** 3697,3703 ****
(buffer-substring (point) header-end)))
(setq header (buffer-substring (point) header-end))))
(put-text-property (point-min) (1+ (point-min))
! 'header-line (Info-escape-percent header))
;; Hide the part of the first line
;; that is in the header, if it is just part.
(unless (bobp)
--- 3678,3688 ----
(buffer-substring (point) header-end)))
(setq header (buffer-substring (point) header-end))))
(put-text-property (point-min) (1+ (point-min))
! 'header-line
! (replace-regexp-in-string
! "%"
! ;; Preserve text properties on duplicated `%'.
! (lambda (s) (concat s s)) header))
;; Hide the part of the first line
;; that is in the header, if it is just part.
(unless (bobp)
- [Emacs-diffs] Changes to emacs/lisp/info.el, Thien-Thi Nguyen, 2005/08/06
- [Emacs-diffs] Changes to emacs/lisp/info.el, Thien-Thi Nguyen, 2005/08/07
- [Emacs-diffs] Changes to emacs/lisp/info.el, Richard M . Stallman, 2005/08/08
- [Emacs-diffs] Changes to emacs/lisp/info.el, Juri Linkov, 2005/08/09
- [Emacs-diffs] Changes to emacs/lisp/info.el, Lars Hansen, 2005/08/10
- [Emacs-diffs] Changes to emacs/lisp/info.el, Thien-Thi Nguyen, 2005/08/14
- [Emacs-diffs] Changes to emacs/lisp/info.el, Andreas Schwab, 2005/08/14
- [Emacs-diffs] Changes to emacs/lisp/info.el,
Juri Linkov <=