Mercurial > emacs
view nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist @ 111679:33ed3cf8260b
Initial support for unified DVCS pull and merge.
* lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
(vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
(vc-bzr-merge-branch): New functions, implementing merge-branch
and pull operations.
* lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
Accept optional prefix arg meaning to prompt for a command.
(vc-update): Use vc-BACKEND-pull if available. Accept optional
prefix arg meaning to prompt for a command.
(vc-pull): Alias for vc-update.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 22 Nov 2010 20:15:08 -0500 |
parents | b4d27afff1bf |
children | 40af77a50adc |
line wrap: on
line source
{ ApplicationDescription = "GNU Emacs for GNUstep / OS X"; ApplicationIcon = emacs.tiff; ApplicationName = Emacs; ApplicationRelease = "24.0.50"; Authors = ( "Adrian Robert (GNUstep)", "Christophe de Dinechin (MacOS X)", "Scott Bender (OpenStep)", "Christian Limpach (NeXTStep)", "Carl Edman (NeXTStep)", "..see http://emacs-app.sf.net/authorship.html" ); Copyright = "Copyright (C) 2010 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; FullVersionID = "Emacs 24.0.50, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; NSRole = Application; NSTypes = ( { NSDocumentClass = ""; NSHumanReadableName = ""; NSIcon = ""; NSName = ""; NSRole = ""; NSUnixExtensions = ( txt ); }, { NSDocumentClass = ""; NSHumanReadableName = ""; NSIcon = ""; NSName = ""; NSRole = ""; NSUnixExtensions = ( c, h ); }, { NSDocumentClass = ""; NSHumanReadableName = ""; NSIcon = ""; NSName = ""; NSRole = ""; NSUnixExtensions = ( m ); }, { NSDocumentClass = ""; NSHumanReadableName = ""; NSIcon = ""; NSName = ""; NSRole = ""; NSUnixExtensions = ( C, cpp, H, cc ); }, { NSDocumentClass = ""; NSHumanReadableName = ""; NSIcon = ""; NSName = ""; NSRole = ""; NSUnixExtensions = ( java ); }, { NSDocumentClass = ""; NSHumanReadableName = ""; NSIcon = ""; NSName = ""; NSRole = ""; NSUnixExtensions = ( el ); }, { NSDocumentClass = ""; NSHumanReadableName = ""; NSIcon = ""; NSName = ""; NSRole = ""; NSUnixExtensions = ( * ); } ); NSServices = ( { NSPortName = Emacs; NSMessage = requestService; NSUserData = open-selection; NSSendTypes = (NSStringPboardType); NSMenuItem = { default = "Emacs.app/New Buffer Containing Selection"; }; }, { NSPortName = Emacs; NSMessage = requestService; NSUserData = open-file; NSSendTypes = (NSStringPboardType); NSMenuItem = { default = "Emacs.app/Open Selected File"; }; }, { NSPortName = Emacs; NSMessage = requestService; NSUserData = mail-selection; NSSendTypes = (NSStringPboardType); NSMenuItem = { default = "Emacs.app/Email Selection"; }; }, { NSPortName = Emacs; NSMessage = requestService; NSUserData = mail-to; NSSendTypes = (NSStringPboardType); NSMenuItem = { default = "Emacs.app/Send Email to Selected Address"; }; }, ); URL = "http://www.gnu.org/software/emacs"; }