From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Case of Info navigation keywords Date: Sat, 29 Oct 2005 01:04:47 +0300 Organization: JURTA Message-ID: <87wtjxqtvv.fsf@jurta.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1130539866 19550 80.91.229.2 (28 Oct 2005 22:51:06 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 28 Oct 2005 22:51:06 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Oct 29 00:50:55 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EVd2Y-00014c-Bx for ged-emacs-devel@m.gmane.org; Sat, 29 Oct 2005 00:49:38 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EVd2Y-0006aQ-3o for ged-emacs-devel@m.gmane.org; Fri, 28 Oct 2005 18:49:38 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EVd2O-0006Zo-7G for emacs-devel@gnu.org; Fri, 28 Oct 2005 18:49:28 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EVd2M-0006ZS-Gs for emacs-devel@gnu.org; Fri, 28 Oct 2005 18:49:27 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EVd2M-0006ZP-EZ for emacs-devel@gnu.org; Fri, 28 Oct 2005 18:49:26 -0400 Original-Received: from [194.126.101.111] (helo=mail.neti.ee) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EVd2M-0000Tj-52 for emacs-devel@gnu.org; Fri, 28 Oct 2005 18:49:26 -0400 Original-Received: from mail.neti.ee (80-235-33-231-dsl.mus.estpak.ee [80.235.33.231]) by Relayhost1.neti.ee (Postfix) with ESMTP id 3EDB920D6 for ; Sat, 29 Oct 2005 01:49:38 +0300 (EEST) Original-To: emacs-devel@gnu.org User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) X-Virus-Scanned: by amavisd-new-2.2.1 (20041222) (Debian) at neti.ee X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:45055 Archived-At: The only place in info.el which is case-sensitive to the keywords "Node", "Next", "Previous", and "Up" is `Info-fontify-node'. This causes incorrect processing of the header line with lower-case keywords. Other places in info.el are all case-insensitive for these keywords, so e.g. n/p keys properly respond to "next/previous" just as well as to "Next/Previous". I propose to fix `Info-fontify-node' to depend on the value of `case-fold-search' by using `string-match' instead of `string-equal': Index: lisp/info.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/info.el,v retrieving revision 1.454 diff -c -w -b -r1.454 info.el *** lisp/info.el 26 Oct 2005 16:38:36 -0000 1.454 --- lisp/info.el 28 Oct 2005 22:02:45 -0000 *************** *** 3649,3655 **** (nend (match-end 2)) (tbeg (match-beginning 1)) (tag (match-string 1))) ! (if (string-equal tag "Node") (put-text-property nbeg nend 'font-lock-face 'info-header-node) (put-text-property nbeg nend 'font-lock-face 'info-header-xref) (put-text-property tbeg nend 'mouse-face 'highlight) --- 3667,3673 ---- (nend (match-end 2)) (tbeg (match-beginning 1)) (tag (match-string 1))) ! (if (string-match "^Node$" tag) (put-text-property nbeg nend 'font-lock-face 'info-header-node) (put-text-property nbeg nend 'font-lock-face 'info-header-xref) (put-text-property tbeg nend 'mouse-face 'highlight) *************** *** 3660,3670 **** ;; Always set up the text property keymap. ;; It will either be used in the buffer ;; or copied in the header line. ! (put-text-property tbeg nend 'keymap (cond ! ((equal tag "Prev") Info-prev-link-keymap) ! ((equal tag "Next") Info-next-link-keymap) ! ((equal tag "Up") Info-up-link-keymap)))))) (when Info-use-header-line (goto-char (point-min)) (let* ((header-end (line-end-position)) --- 3678,3689 ---- ;; Always set up the text property keymap. ;; It will either be used in the buffer ;; or copied in the header line. ! (put-text-property ! tbeg nend 'keymap (cond ! ((string-match "^Prev$" tag) Info-prev-link-keymap) ! ((string-match "^Next$" tag) Info-next-link-keymap) ! ((string-match "^Up$" tag) Info-up-link-keymap)))))) (when Info-use-header-line (goto-char (point-min)) (let* ((header-end (line-end-position)) -- Juri Linkov http://www.jurta.org/emacs/