← Back to branch summary

~ubuntu-branches/debian/sid/emacs24/sid

« back to all changes in this revision

Viewing changes to lisp/vc/smerge-mode.el

  • Committer: Package Import Robot
  • Author(s): Rob Browning
  • Date: 2015-06-17 00:06:26 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20150617000626-uxmby0fbe538wwry
Tags: 24.5+1-1
* Merge upstream version 24.5 (shift from the bzr->git mirror to the
  new official upstream git repository for the source).
  Remove redundant patches:
    0008-A-race-to-create-info-has-been-eliminated.patch
    0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch

* Update debian/copyright* for 24.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lisp/vc/smerge-mode.el
1
1
;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -*- lexical-binding: t -*-
2
2
 
3
 
;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
3
;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
4
4
 
5
5
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
6
6
;; Keywords: vc, tools, revision control, merge, diff3, cvs, conflict
116
116
(define-obsolete-face-alias 'smerge-markers-face 'smerge-markers "22.1")
117
117
(defvar smerge-markers-face 'smerge-markers)
118
118
 
119
 
(defface smerge-refined-change
 
119
(defface smerge-refined-changed
120
120
  '((t nil))
121
121
  "Face used for char-based changes shown by `smerge-refine'.")
 
122
(define-obsolete-face-alias 'smerge-refined-change 'smerge-refined-changed "24.5")
122
123
 
123
124
(defface smerge-refined-removed
124
125
  '((default