From 85486f8623f6d9a12f7b251445ac9d203d3ae348 Mon Sep 17 00:00:00 2001
From: nion <nion@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Sun, 13 Mar 2005 18:40:58 +0000
Subject: [PATCH] Nico Golde: - included current-shortcut patch - fixed names

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@171 e385b8ad-14ed-0310-8656-cc95a2468c6d
---
 PATCHES              | 1 +
 curs_main.c          | 1 +
 doc/manual.sgml.head | 1 +
 doc/mutt.man         | 2 +-
 doc/muttrc.man.tail  | 2 +-
 globals.h            | 1 +
 main.c               | 4 +++-
 muttlib.c            | 7 +++++++
 8 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/PATCHES b/PATCHES
index 5a1a985..930e1b5 100644
--- a/PATCHES
+++ b/PATCHES
@@ -1,3 +1,4 @@
+patch-1.5.6.cb.current_shortcut.2
 patch-1.5.6.tt.assumed_charset.1
 patch-1.5.6.tg.hcache.12
 patch-1.5.5.1.pdmef.short_mbox_name.1
diff --git a/curs_main.c b/curs_main.c
index 9969bbc..f3bc7c0 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -1310,6 +1310,7 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
           mutt_error (_("%s is not a mailbox."), buf);
           break;
         }
+        mutt_str_replace (&CurrentFolder, buf);
 
         if (Context)
         {
diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head
index 2b5df61..33fb23e 100644
--- a/doc/manual.sgml.head
+++ b/doc/manual.sgml.head
@@ -2391,6 +2391,7 @@ path.
 <item>! -- refers to your <ref id="spoolfile" name="&dollar;spoolfile"> (incoming) mailbox
 <item>&gt; -- refers to your <ref id="mbox" name="&dollar;mbox"> file
 <item>&lt; -- refers to your <ref id="record" name="&dollar;record"> file
+<item>^ -- refers to the current mailbox
 <item>- or !! -- refers to the file you've last visited
 <item>&tilde; -- refers to your home directory
 <item>= or + -- refers to your <ref id="folder" name="&dollar;folder"> directory
diff --git a/doc/mutt.man b/doc/mutt.man
index f4a2c54..07856ba 100644
--- a/doc/mutt.man
+++ b/doc/mutt.man
@@ -195,7 +195,7 @@ GNU General Public License for more details.
 .BR sendmail (1),
 .BR smail (1)
 .PP
-Mutt-ng Home Page: http://mutt-ng.berlios.de
+Mutt-ng Home Page: http://www.muttng.org
 .PP
 The Mutt-ng manual
 .PP
diff --git a/doc/muttrc.man.tail b/doc/muttrc.man.tail
index d9399a8..38bd4c7 100644
--- a/doc/muttrc.man.tail
+++ b/doc/muttrc.man.tail
@@ -13,7 +13,7 @@
 .PP
 The Mutt-ng Manual
 .PP
-The Mutt-ng home page: http://mutt-ng.berlios.de
+The Mutt-ng home page: http://www.muttng.org
 .SH AUTHOR
 .PP
 Michael Elkins, and others.  Use <mutt-ng-devel@lists.berlios.de> to contact
diff --git a/globals.h b/globals.h
index 2fc7ff1..45449e8 100644
--- a/globals.h
+++ b/globals.h
@@ -156,6 +156,7 @@ WHERE char *Visual;
 WHERE char *XtermTitle;
 WHERE char *XtermIcon;
 
+WHERE char *CurrentFolder;
 WHERE char *LastFolder;
 
 WHERE LIST *AutoViewList INITVAL(0);
diff --git a/main.c b/main.c
index 1568951..8f8ca9d 100644
--- a/main.c
+++ b/main.c
@@ -54,6 +54,7 @@
 
 static const char *ReachingUs = N_("\
 To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
+To visit the Mutt-ng homepage go to http://www.muttng.org.\n\
 To report a bug, please use the fleang(1) utility.\n");
 
 static const char *Notice = N_("\
@@ -994,7 +995,8 @@ int main (int argc, char **argv)
     else
 #endif
     mutt_expand_path (folder, sizeof (folder));
-
+    
+    mutt_str_replace (&CurrentFolder, folder);
     mutt_str_replace (&LastFolder, folder);
 
     if (flags & M_IGNORE)
diff --git a/muttlib.c b/muttlib.c
index 0340d20..876063d 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -456,6 +456,13 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
       }
       break;
       
+      case '^':
+      {
+        strfcpy (p, NONULL(CurrentFolder), sizeof (p));
+        tail = s + 1;
+      }
+      break;
+ 
       default:
       {
 	*p = '\0';
-- 
2.20.1