Commit 4021d6a6 authored by Stefan Monnier's avatar Stefan Monnier

* lisp/vc/smerge-mode.el: Remove redundant :group args.

parent 3ec7babc
2013-08-28 Stefan Monnier <monnier@iro.umontreal.ca> 2013-08-28 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/smerge-mode.el: Remove redundant :group args.
* emacs-lisp/package.el (package-activate-1): Don't add unnecessarily * emacs-lisp/package.el (package-activate-1): Don't add unnecessarily
to load-path. to load-path.
......
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
(defcustom smerge-diff-buffer-name "*vc-diff*" (defcustom smerge-diff-buffer-name "*vc-diff*"
"Buffer name to use for displaying diffs." "Buffer name to use for displaying diffs."
:group 'smerge
:type '(choice :type '(choice
(const "*vc-diff*") (const "*vc-diff*")
(const "*cvs-diff*") (const "*cvs-diff*")
...@@ -69,12 +68,10 @@ ...@@ -69,12 +68,10 @@
(if (listp diff-switches) diff-switches (list diff-switches))) (if (listp diff-switches) diff-switches (list diff-switches)))
"A list of strings specifying switches to be passed to diff. "A list of strings specifying switches to be passed to diff.
Used in `smerge-diff-base-mine' and related functions." Used in `smerge-diff-base-mine' and related functions."
:group 'smerge
:type '(repeat string)) :type '(repeat string))
(defcustom smerge-auto-leave t (defcustom smerge-auto-leave t
"Non-nil means to leave `smerge-mode' when the last conflict is resolved." "Non-nil means to leave `smerge-mode' when the last conflict is resolved."
:group 'smerge
:type 'boolean) :type 'boolean)
(defface smerge-mine (defface smerge-mine
...@@ -84,8 +81,7 @@ Used in `smerge-diff-base-mine' and related functions." ...@@ -84,8 +81,7 @@ Used in `smerge-diff-base-mine' and related functions."
:background "#553333") :background "#553333")
(((class color)) (((class color))
:foreground "red")) :foreground "red"))
"Face for your code." "Face for your code.")
:group 'smerge)
(define-obsolete-face-alias 'smerge-mine-face 'smerge-mine "22.1") (define-obsolete-face-alias 'smerge-mine-face 'smerge-mine "22.1")
(defvar smerge-mine-face 'smerge-mine) (defvar smerge-mine-face 'smerge-mine)
...@@ -96,8 +92,7 @@ Used in `smerge-diff-base-mine' and related functions." ...@@ -96,8 +92,7 @@ Used in `smerge-diff-base-mine' and related functions."
:background "#335533") :background "#335533")
(((class color)) (((class color))
:foreground "green")) :foreground "green"))
"Face for the other code." "Face for the other code.")
:group 'smerge)
(define-obsolete-face-alias 'smerge-other-face 'smerge-other "22.1") (define-obsolete-face-alias 'smerge-other-face 'smerge-other "22.1")
(defvar smerge-other-face 'smerge-other) (defvar smerge-other-face 'smerge-other)
...@@ -108,8 +103,7 @@ Used in `smerge-diff-base-mine' and related functions." ...@@ -108,8 +103,7 @@ Used in `smerge-diff-base-mine' and related functions."
:background "#888833") :background "#888833")
(((class color)) (((class color))
:foreground "yellow")) :foreground "yellow"))
"Face for the base code." "Face for the base code.")
:group 'smerge)
(define-obsolete-face-alias 'smerge-base-face 'smerge-base "22.1") (define-obsolete-face-alias 'smerge-base-face 'smerge-base "22.1")
(defvar smerge-base-face 'smerge-base) (defvar smerge-base-face 'smerge-base)
...@@ -118,15 +112,13 @@ Used in `smerge-diff-base-mine' and related functions." ...@@ -118,15 +112,13 @@ Used in `smerge-diff-base-mine' and related functions."
(:background "grey85")) (:background "grey85"))
(((background dark)) (((background dark))
(:background "grey30"))) (:background "grey30")))
"Face for the conflict markers." "Face for the conflict markers.")
:group 'smerge)
(define-obsolete-face-alias 'smerge-markers-face 'smerge-markers "22.1") (define-obsolete-face-alias 'smerge-markers-face 'smerge-markers "22.1")
(defvar smerge-markers-face 'smerge-markers) (defvar smerge-markers-face 'smerge-markers)
(defface smerge-refined-change (defface smerge-refined-change
'((t nil)) '((t nil))
"Face used for char-based changes shown by `smerge-refine'." "Face used for char-based changes shown by `smerge-refine'.")
:group 'smerge)
(defface smerge-refined-removed (defface smerge-refined-removed
'((default '((default
...@@ -137,7 +129,6 @@ Used in `smerge-diff-base-mine' and related functions." ...@@ -137,7 +129,6 @@ Used in `smerge-diff-base-mine' and related functions."
:background "#aa2222") :background "#aa2222")
(t :inverse-video t)) (t :inverse-video t))
"Face used for removed characters shown by `smerge-refine'." "Face used for removed characters shown by `smerge-refine'."
:group 'smerge
:version "24.3") :version "24.3")
(defface smerge-refined-added (defface smerge-refined-added
...@@ -149,7 +140,6 @@ Used in `smerge-diff-base-mine' and related functions." ...@@ -149,7 +140,6 @@ Used in `smerge-diff-base-mine' and related functions."
:background "#22aa22") :background "#22aa22")
(t :inverse-video t)) (t :inverse-video t))
"Face used for added characters shown by `smerge-refine'." "Face used for added characters shown by `smerge-refine'."
:group 'smerge
:version "24.3") :version "24.3")
(easy-mmode-defmap smerge-basic-map (easy-mmode-defmap smerge-basic-map
...@@ -172,7 +162,6 @@ Used in `smerge-diff-base-mine' and related functions." ...@@ -172,7 +162,6 @@ Used in `smerge-diff-base-mine' and related functions."
(defcustom smerge-command-prefix "\C-c^" (defcustom smerge-command-prefix "\C-c^"
"Prefix for `smerge-mode' commands." "Prefix for `smerge-mode' commands."
:group 'smerge
:type '(choice (const :tag "ESC" "\e") :type '(choice (const :tag "ESC" "\e")
(const :tag "C-c ^" "\C-c^" ) (const :tag "C-c ^" "\C-c^" )
(const :tag "none" "") (const :tag "none" "")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment