Mercurial > emacs
view etc/images/mh-logo.xpm @ 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 | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
/* XPM */ /* MH-E Logo * * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 * Free Software Foundation, Inc. * * Author: Satyaki Das * * This file is part of GNU Emacs. * * GNU Emacs is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * GNU Emacs is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ static char *mh-e[] = { /* width height num_colors chars_per_pixel */ " 18 13 2 1", /* colors */ "# c #666699", ". c None s None", /* pixels */ "........##........", ".......####.......", "......######......", "......######......", "....#########.....", "..##############..", ".##...######....#.", "##...#.#.####...#.", "....#..#.##.#...#.", "...#..##.#.#.#....", "...#..#..#..#.#...", "...#..#.##..#.##..", "...#..#.#..#....#." };