From mboxrd@z Thu Jan  1 00:00:00 1970
From: rpgoldman@sift.info
Subject: [PATCH] Add an easy template for index (i), and move include file to
 I from i.
Date: Thu, 28 Apr 2011 10:38:54 -0500
Message-ID: <1304005134-31639-2-git-send-email-rpgoldman@sift.info>
References: <10844.1303994001@alphaville.dokosmarshall.org>
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:45131)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rpgoldman@sift.info>) id 1QFTJJ-0001iY-85
	for emacs-orgmode@gnu.org; Thu, 28 Apr 2011 11:39:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rpgoldman@sift.info>) id 1QFTJH-0001aM-Tr
	for emacs-orgmode@gnu.org; Thu, 28 Apr 2011 11:39:21 -0400
Received: from enchanter.real-time.com ([63.170.91.11]:4333)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rpgoldman@sift.info>) id 1QFTJH-0001a7-P7
	for emacs-orgmode@gnu.org; Thu, 28 Apr 2011 11:39:19 -0400
In-Reply-To: <10844.1303994001@alphaville.dokosmarshall.org>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org
Cc: "Robert P. Goldman" <rpgoldman@real-time.com>

From: Robert P. Goldman <rpgoldman@real-time.com>

Implement Nick Dokos' suggestion for inserting #+INDEX.

Notes about this patch:
1.  It breaks some old user-visible behavior, since <i changes meaning.
    Per Nick's posting, we expect that if index is used, it will be used
    more commonly than include file.  However, since this is a custom,
    behavior could be changed.  Indeed, we could put index on capital
    I with a suggestion that users who are indexing should swap in their
    customizations.
2.  I modified the docstring for org-structure-template-alist, which did
    not explain the function of the "?" in the string.  Someone should
    check and verify I didn't get this wrong.
3.  There doesn't seem to be a Muse tag equivalent for #+index, so I
    just made the Muse equivalent of #+index be #+index.  I don't know
    org-mtags enough to know if this is appropriate.
---
 lisp/org.el |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index e17c90f..fdff7ef 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10753,14 +10753,17 @@ This function can be used in a hook."
          "<literal style=\"html\">?</literal>")
     ("a" "#+begin_ascii\n?\n#+end_ascii")
     ("A" "#+ascii: ")
-    ("i" "#+include %file ?"
+    ("i" "#+index: ?"
+     "#+index: ?")
+    ("I" "#+include %file ?"
          "<include file=%file markup=\"?\">")
     )
   "Structure completion elements.
 This is a list of abbreviation keys and values.  The value gets inserted
 if you type `<' followed by the key and then press the completion key,
 usually `M-TAB'.  %file will be replaced by a file name after prompting
-for the file using completion.
+for the file using completion.  The cursor will be placed at the position
+of the `?` in the template.
 There are two templates for each key, the first uses the original Org syntax,
 the second uses Emacs Muse-like syntax tags.  These Muse-like tags become
 the default when the /org-mtags.el/ module has been loaded.  See also the
@@ -10779,7 +10782,7 @@ expands them."
   (let ((l (buffer-substring (point-at-bol) (point)))
 	a)
     (when (and (looking-at "[ \t]*$")
-	       (string-match "^[ \t]*<\\([a-z]+\\)$"l)
+	       (string-match "^[ \t]*<\\([a-zA-Z]+\\)$" l)
 	       (setq a (assoc (match-string 1 l) org-structure-template-alist)))
       (org-complete-expand-structure-template (+ -1 (point-at-bol)
 						 (match-beginning 1)) a)
-- 
1.7.3.5