Mercurial > emacs
view lisp/emulation/pc-mode.el @ 89970:a849e5779b8c
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-35
Fix damage caused by trunk merge in emacs--unicode--0--patch-15
Some files in the emacs--cvs-trunk--0 branch had their arch id-tag changed
from tagline to explicit [because they were used as template files, and their
syntax didn't accommodate stripping comments, so the the generated files
caused id-tag conflicts when an in-tree build was done].
Unfortunately arch doesn't handle id-tag changes well, so this resulted in
the files appearing to be deleted, and then added again. When that changeset
was merged into the unicode branch, it resulted in unicode-specific changes
being dropped, and the trunk version being added.
To fix this, I restored these files to their pre-merge versions (from
emacs--unicode--0--patch-14), and then manually reapplied all changes from:
(1) the unicode branch from the bogus merge point to the current version
(emacs--unicode--0--patch-15 - emacs--unicode--0--patch-34)
(2) the trunk from the bogus merge point to the latest version which was
merged into the unicode branch
(emacs--cvs-trunk--0--patch-218 - emacs--cvs-trunk--0--patch-522)
and fixed any conflicts (mostly due to doubly-applied patch hunks that patch
couldn't detect).
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 05 Sep 2004 01:53:47 +0000 |
parents | 68c22ea6027c |
children | f9a65d7ebd29 |
line wrap: on
line source
;;; pc-mode.el --- emulate certain key bindings used on PCs ;; Copyright (C) 1995 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations ;; 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 2, 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; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;;; Code: ;;;###autoload (defun pc-bindings-mode () "Set up certain key bindings for PC compatibility. The keys affected are: Delete (and its variants) delete forward instead of backward. C-Backspace kills backward a word (as C-Delete normally would). M-Backspace does undo. Home and End move to beginning and end of line C-Home and C-End move to beginning and end of buffer. C-Escape does list-buffers." (interactive) (define-key function-key-map [delete] "\C-d") (define-key function-key-map [M-delete] [?\M-d]) (define-key function-key-map [C-delete] [?\M-d]) (global-set-key [C-M-delete] 'kill-sexp) (global-set-key [C-backspace] 'backward-kill-word) (global-set-key [M-backspace] 'undo) (global-set-key [C-escape] 'list-buffers) (global-set-key [home] 'beginning-of-line) (global-set-key [end] 'end-of-line) (global-set-key [C-home] 'beginning-of-buffer) (global-set-key [C-end] 'end-of-buffer)) (provide 'pc-mode) ;;; arch-tag: df007c05-f885-4cd0-8c1e-487d0f8dd9c9 ;;; pc-mode.el ends here