comparison lisp/org/org-info.el @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents a7740098b594 376148b31b5e
children ef719132ddfa
comparison
equal deleted inserted replaced
112227:07e52ed69b5d 112228:417b1e4d63cd
1 ;;; org-info.el --- Support for links to Info nodes from within Org-Mode 1 ;;; org-info.el --- Support for links to Info nodes from within Org-Mode
2 2
3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
4 ;; Free Software Foundation, Inc. 4 ;; Free Software Foundation, Inc.
5 5
6 ;; Author: Carsten Dominik <carsten at orgmode dot org> 6 ;; Author: Carsten Dominik <carsten at orgmode dot org>
7 ;; Keywords: outlines, hypermedia, calendar, wp 7 ;; Keywords: outlines, hypermedia, calendar, wp
8 ;; Homepage: http://orgmode.org 8 ;; Homepage: http://orgmode.org