[elpa] master 57f1392: Handle multi remote repositories
branch: master commit 57f13922b22c1386ec2201b84d0cf82e699950f7 Author: Tino Calancha Commit: Tino Calancha Handle multi remote repositories It's common to have a local repository linked to more than one remote repository. In such case we must specify the remote repo. from which we want to fetch or push into. This commit adds a new variable `gited-current-remote-rep' to store the current remote repository; we pull/push from/into that repository. It also adds a new command `gited-change-current-remote-rep' to update this variable. Update file header. Bump version to 0.4.1. * packages/gited/gited.el (gited-current-remote-rep): New variable. (gited-toplevel-dir): When listing local branches display the current remote repository in the header line. (gited--update-header-line): New defun. (gited-git-command-on-region): Move isolated ending parens to previous line. (gited-pull, gited-push): Pull/push from/into the current remote rep. (gited-mode-map): Bind `gited-change-current-remote-rep' to '*r'. --- packages/gited/gited.el | 98 +++-- 1 file changed, 70 insertions(+), 28 deletions(-) diff --git a/packages/gited/gited.el b/packages/gited/gited.el index 66459dd..7fdfc91 100644 --- a/packages/gited/gited.el +++ b/packages/gited/gited.el @@ -1,6 +1,6 @@ ;;; gited.el --- Operate on Git branches like dired -*- lexical-binding:t -*- ;; -;; Copyright (C) 2016-2017 Free Software Foundation, Inc. +;; Copyright (C) 2016-2018 Free Software Foundation, Inc. ;; ;; Author: Tino Calancha ;; Maintainer: Tino Calancha @@ -8,11 +8,11 @@ ;; Created: Wed Oct 26 01:28:54 JST 2016 ;; Compatibility: GNU Emacs: 24.4 -;; Version: 0.3.4 +;; Version: 0.4.1 ;; Package-Requires: ((emacs "24.4") (cl-lib "0.5")) -;; Last-Updated: Sun Jan 21 14:07:11 JST 2018 +;; Last-Updated: Mon Mar 26 16:46:14 JST 2018 ;; By: calancha -;; Update #: 683 +;; Update #: 684 ;; ;; @@ -98,21 +98,22 @@ ;; `gited-branch-name-face', `gited-buffer', ;; `gited-buffer-name', `gited-commit-idx', ;; `gited-commit-msg-face', `gited-current-branch', -;; `gited-date-idx', `gited-date-regexp', -;; `gited-date-time-face', `gited-del-char', -;; `gited-deletion-branch-face', `gited-deletion-face', -;; `gited-edit-commit-mode-map', `gited-flag-mark-face', -;; `gited-flag-mark-line-face', `gited-header', -;; `gited-list-format', `gited-list-refs-format-command', -;; `gited-log-buffer', `gited-mark-col-size', -;; `gited-mark-face', `gited-mark-idx', -;; `gited-marker-char', `gited-mode', -;; `gited-mode-map', `gited-modified-branch', -;; `gited-new-or-deleted-files-re', `gited-op-string', -;; `gited-original-buffer', `gited-output-buffer', -;; `gited-output-buffer-name', `gited-re-mark', -;; `gited-ref-kind', `gited-section-highlight-face', -;; `gited-toplevel-dir', `gited-trunk-branch'. +;; `gited-current-remote-rep', `gited-date-idx', +;; `gited-date-regexp', `gited-date-time-face', +;; `gited-del-char', `gited-deletion-branch-face', +;; `gited-deletion-face', `gited-edit-commit-mode-map', +;; `gited-flag-mark-face', `gited-flag-mark-line-face', +;; `gited-header', `gited-list-format', +;; `gited-list-refs-format-command', `gited-log-buffer', +;; `gited-mark-col-size', `gited-mark-face', +;; `gited-mark-idx', `gited-marker-char', +;; `gited-mode', `gited-mode-map', +;; `gited-modified-branch', `gited-new-or-deleted-files-re', +;; `gited-op-string', `gited-original-buffer', +;; `gited-output-buffer', `gited-output-buffer-name', +;; `gited-re-mark', `gited-ref-kind', +;; `gited-section-highlight-face', `gited-toplevel-dir', +;; `gited-trunk-branch'. ;; ;; Coustom variables defined here: ;; @@ -195,10 +196,11 @@ ;; `gited--move-to-end-of-column', `gited--output-buffer', ;; `gited--patch-or-commit-buffer', `gited--set-output-buffer-mode', ;; `gited--stash-branch', `gited--sync-with-trunk-target-name', -;; `gited--update-padding', `gited--valid-ref-p', -;; `gited-all-branches', `gited-async-operation-sentinel', -;; `gited-at-header-line-p', `gited-bisecting-p', -;; `gited-branch-exists-p', `gited-buffer-p', +;; `gited--update-header-line', `gited--update-padding', +;; `gited--valid-ref-p', `gited-all-branches', +;; `gited-async-operation-sentinel', `gited-at-header-line-p', +;; `gited-bisecting-p', `gited-branch-exists-p', +;; `gited-buffer-p', `gited-change-current-remote-rep', ;; `gited-current-branch', `gited-current-branches-with-marks', ;; `gited-current-state-list', `gited-dir-under-Git-control-p', ;; `gited-edit-commit', `gited-fontify-current-branch', @@ -257,6 +259,10 @@ "The branch currently checked out.") (put 'gited-current-branch 'permanent-local t) +(defvar-local gited-current-remote-rep "origin" + "The remote reposito
[elpa] master e08cec3 2/4: Set type of customizable options
branch: master commit e08cec3807c0cc546387b6405089fd364533b457 Author: Jonas Bernoulli Commit: Julien Danjou Set type of customizable options --- packages/rainbow-mode/rainbow-mode.el | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/rainbow-mode/rainbow-mode.el b/packages/rainbow-mode/rainbow-mode.el index fbed414..e1796e4 100644 --- a/packages/rainbow-mode/rainbow-mode.el +++ b/packages/rainbow-mode/rainbow-mode.el @@ -225,12 +225,14 @@ ("YellowGreen" . "#9ACD32")) "Alist of HTML colors. Each entry should have the form (COLOR-NAME . HEXADECIMAL-COLOR)." + :type 'alist :group 'rainbow) (defcustom rainbow-html-colors-major-mode-list '(html-mode css-mode php-mode nxml-mode xml-mode) "List of major mode where HTML colors are enabled when `rainbow-html-colors' is set to auto." + :type '(repeat (symbol :tag "Major-Mode")) :group 'rainbow) (defcustom rainbow-html-colors 'auto @@ -239,6 +241,9 @@ If set to t, the HTML colors will be enabled. If set to nil, the HTML colors will not be enabled. If set to auto, the HTML colors will be enabled if a major mode has been detected from the `rainbow-html-colors-major-mode-list'." + :type '(choice (symbol :tag "enable in certain modes" auto) + (symbol :tag "enable globally" t) + (symbol :tag "disable" nil)) :group 'rainbow) ;; X colors @@ -251,6 +256,7 @@ will be enabled if a major mode has been detected from the '(emacs-lisp-mode lisp-interaction-mode c-mode c++-mode java-mode) "List of major mode where X colors are enabled when `rainbow-x-colors' is set to auto." + :type '(repeat (symbol :tag "Major-Mode")) :group 'rainbow) (defcustom rainbow-x-colors 'auto @@ -259,6 +265,9 @@ If set to t, the X colors will be enabled. If set to nil, the X colors will not be enabled. If set to auto, the X colors will be enabled if a major mode has been detected from the `rainbow-x-colors-major-mode-list'." + :type '(choice (symbol :tag "enable in certain modes" auto) + (symbol :tag "enable globally" t) + (symbol :tag "disable" nil)) :group 'rainbow) ;; LaTeX colors @@ -275,6 +284,7 @@ will be enabled if a major mode has been detected from the '(latex-mode) "List of major mode where LaTeX colors are enabled when `rainbow-x-colors' is set to auto." + :type '(repeat (symbol :tag "Major-Mode")) :group 'rainbow) (defcustom rainbow-latex-colors 'auto @@ -283,6 +293,9 @@ If set to t, the LaTeX colors will be enabled. If set to nil, the LaTeX colors will not be enabled. If set to auto, the LaTeX colors will be enabled if a major mode has been detected from the `rainbow-latex-colors-major-mode-list'." + :type '(choice (symbol :tag "enable in certain modes" auto) + (symbol :tag "enable globally" t) + (symbol :tag "disable" nil)) :group 'rainbow) ;; Shell colors @@ -295,6 +308,7 @@ will be enabled if a major mode has been detected from the '(sh-mode c-mode c++-mode) "List of major mode where ANSI colors are enabled when `rainbow-ansi-colors' is set to auto." + :type '(repeat (symbol :tag "Major-Mode")) :group 'rainbow) (defcustom rainbow-ansi-colors 'auto @@ -303,6 +317,9 @@ If set to t, the ANSI colors will be enabled. If set to nil, the ANSI colors will not be enabled. If set to auto, the ANSI colors will be enabled if a major mode has been detected from the `rainbow-ansi-colors-major-mode-list'." + :type '(choice (symbol :tag "enable in certain modes" auto) + (symbol :tag "enable globally" t) + (symbol :tag "disable" nil)) :group 'rainbow) ;; R colors @@ -975,11 +992,14 @@ will be enabled if a major mode has been detected from the ("yellowgreen" . "#9ACD32")) "Alist of R colors. Each entry should have the form (COLOR-NAME . HEXADECIMAL-COLOR)." + :type 'alist :group 'rainbow) + (defcustom rainbow-r-colors-major-mode-list '(ess-mode) "List of major mode where R colors are enabled when `rainbow-r-colors' is set to auto." + :type '(repeat (symbol :tag "Major-Mode")) :group 'rainbow) (defcustom rainbow-r-colors 'auto @@ -988,9 +1008,11 @@ If set to t, the R colors will be enabled. If set to nil, the R colors will not be enabled. If set to auto, the R colors will be enabled if a major mode has been detected from the `rainbow-r-colors-major-mode-list'." + :type '(choice (symbol :tag "enable in certain modes" auto) + (symbol :tag "enable globally" t) + (symbol :tag "disable" nil)) :group 'rainbow) - ;; Functions (defun rainbow-colorize-match (color &optional match) "Return a matched string propertized with a face whose
[elpa] master updated (57f1392 -> fc74f6e)
jdanjou pushed a change to branch master. from 57f1392 Handle multi remote repositories new 8f222f2 Enforce use of spaces for indentation new e08cec3 Set type of customizable options new b674274 Allow outline-minor-mode to find section headings new fc74f6e rainbow-mode: release 1.0 Summary of changes: packages/rainbow-mode/rainbow-mode.el | 61 +++ 1 file changed, 47 insertions(+), 14 deletions(-)
[elpa] master b674274 3/4: Allow outline-minor-mode to find section headings
branch: master commit b674274beddb4290c34ce5c7ae3988ae31e97081 Author: Jonas Bernoulli Commit: Julien Danjou Allow outline-minor-mode to find section headings --- packages/rainbow-mode/rainbow-mode.el | 26 +- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/packages/rainbow-mode/rainbow-mode.el b/packages/rainbow-mode/rainbow-mode.el index e1796e4..e8d4b02 100644 --- a/packages/rainbow-mode/rainbow-mode.el +++ b/packages/rainbow-mode/rainbow-mode.el @@ -44,7 +44,8 @@ :tag "Rainbow" :group 'help) -;; Hexadecimal colors +;;; Hexadecimal colors + (defvar rainbow-hexadecimal-colors-font-lock-keywords '(("[^&]\\(#\\(?:[0-9a-fA-F]\\{3\\}\\)+\\{1,4\\}\\)" (1 (rainbow-colorize-itself 1))) @@ -58,7 +59,8 @@ (0 (rainbow-colorize-itself "Font-lock keywords to add for hexadecimal colors.") -;; rgb() colors +;;; rgb() colors + (defvar rainbow-html-rgb-colors-font-lock-keywords '(("rgb(\s*\\([0-9]\\{1,3\\}\\(?:\.[0-9]\\)?\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\\.[0-9]\\)?\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\\.[0-9]\\)?\\(?:\s*%\\)?\\)\s*)" (0 (rainbow-colorize-rgb))) @@ -70,7 +72,8 @@ (0 (rainbow-colorize-hsl "Font-lock keywords to add for RGB colors.") -;; HTML colors name +;;; HTML colors + (defvar rainbow-html-colors-font-lock-keywords nil "Font-lock keywords to add for HTML colors.") (make-variable-buffer-local 'rainbow-html-colors-font-lock-keywords) @@ -246,7 +249,8 @@ will be enabled if a major mode has been detected from the (symbol :tag "disable" nil)) :group 'rainbow) -;; X colors +;;; X colors + (defvar rainbow-x-colors-font-lock-keywords `((,(regexp-opt (x-defined-colors) 'words) (0 (rainbow-colorize-itself @@ -270,7 +274,8 @@ will be enabled if a major mode has been detected from the (symbol :tag "disable" nil)) :group 'rainbow) -;; LaTeX colors +;;; LaTeX colors + (defvar rainbow-latex-rgb-colors-font-lock-keywords '(("{rgb}{\\([0-9.]+\\),\s*\\([0-9.]+\\),\s*\\([0-9.]+\\)}" (0 (rainbow-colorize-rgb-float))) @@ -298,7 +303,8 @@ will be enabled if a major mode has been detected from the (symbol :tag "disable" nil)) :group 'rainbow) -;; Shell colors +;;; Shell colors + (defvar rainbow-ansi-colors-font-lock-keywords '(("\\([eE]\\|033\\|x1[bB]\\|\033\\)\\[\\([0-9;]*m\\)" (0 (rainbow-colorize-ansi @@ -322,9 +328,8 @@ will be enabled if a major mode has been detected from the (symbol :tag "disable" nil)) :group 'rainbow) -;; R colors +;;; R colors -;; R colors name (defvar rainbow-r-colors-font-lock-keywords nil "Font-lock keywords to add for R colors.") (make-variable-buffer-local 'rainbow-r-colors-font-lock-keywords) @@ -1013,7 +1018,8 @@ will be enabled if a major mode has been detected from the (symbol :tag "disable" nil)) :group 'rainbow) -;; Functions +;;; Functions + (defun rainbow-colorize-match (color &optional match) "Return a matched string propertized with a face whose background is COLOR. The foreground is computed using @@ -1123,6 +1129,8 @@ Return a value between 0 and 1." (b (/ (caddr values) 256.0))) (rainbow-color-luminance r g b))) +;;; Mode + (defun rainbow-turn-on () "Turn on raibow-mode." (font-lock-add-keywords nil
[elpa] master 8f222f2 1/4: Enforce use of spaces for indentation
branch: master commit 8f222f2c4e2e4876f24fdf6cddf1a1296401250c Author: Jonas Bernoulli Commit: Julien Danjou Enforce use of spaces for indentation Also untabify some code added by a contributor who, unlike you, has not globally set `indent-tabs-mode' to nil. --- packages/rainbow-mode/rainbow-mode.el | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/rainbow-mode/rainbow-mode.el b/packages/rainbow-mode/rainbow-mode.el index ddd9a94..fbed414 100644 --- a/packages/rainbow-mode/rainbow-mode.el +++ b/packages/rainbow-mode/rainbow-mode.el @@ -1033,7 +1033,7 @@ If the percentage value is above 100, it's converted to 100." (l (/ (string-to-number (match-string-no-properties 3)) 100.0))) (rainbow-colorize-match (multiple-value-bind (r g b) -(color-hsl-to-rgb h s l) + (color-hsl-to-rgb h s l) (format "#%02X%02X%02X" (* r 255) (* g 255) (* b 255)) (defun rainbow-colorize-rgb () @@ -1096,9 +1096,9 @@ Return a value between 0 and 1." "Calculate the luminance of a color string (e.g. \"#ffaa00\", \"blue\"). Return a value between 0 and 1." (let* ((values (x-color-values color)) -(r (/ (car values) 256.0)) + (r (/ (car values) 256.0)) (g (/ (cadr values) 256.0)) -(b (/ (caddr values) 256.0))) + (b (/ (caddr values) 256.0))) (rainbow-color-luminance r g b))) (defun rainbow-turn-on () @@ -1174,4 +1174,7 @@ This will fontify with colors the string like \"#aabbcc\" or \"blue\"." (provide 'rainbow-mode) +;; Local Variables: +;; indent-tabs-mode: nil +;; End: ;;; rainbow-mode.el ends here
[elpa] master fc74f6e 4/4: rainbow-mode: release 1.0
branch: master commit fc74f6efd01996473c2b15805996dab1b368bbbd Author: Julien Danjou Commit: Julien Danjou rainbow-mode: release 1.0 --- packages/rainbow-mode/rainbow-mode.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rainbow-mode/rainbow-mode.el b/packages/rainbow-mode/rainbow-mode.el index e8d4b02..600c8ed 100644 --- a/packages/rainbow-mode/rainbow-mode.el +++ b/packages/rainbow-mode/rainbow-mode.el @@ -1,10 +1,10 @@ ;;; rainbow-mode.el --- Colorize color names in buffers -;; Copyright (C) 2010-2017 Free Software Foundation, Inc +;; Copyright (C) 2010-2018 Free Software Foundation, Inc ;; Author: Julien Danjou ;; Keywords: faces -;; Version: 0.13 +;; Version: 1.0 ;; This file is part of GNU Emacs.