[gentoo-commits] proj/eselect:master commit in: /, misc/

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Mueller]

commit:     70500045344b0cc9481a481fc026cb43f95d082b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  4 21:40:23 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jul  4 21:40:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=70500045

Add editing mode for Emacs, moved from emacs-tools repository to here.

* misc/eselect-mode.el: New file, editing mode for Emacs,
split off from app-emacs/gentoo-syntax.
* misc/Makefile.am (EXTRA_DIST): Add eselect-mode.el.

---
 ChangeLog            |   6 +++
 misc/Makefile.am     |   2 +-
 misc/eselect-mode.el | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 136 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d877459..1809cfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-04  Ulrich Müller  <ulm@gentoo.org>
+
+	* misc/eselect-mode.el: New file, editing mode for Emacs,
+	split off from app-emacs/gentoo-syntax.
+	* misc/Makefile.am (EXTRA_DIST): Add eselect-mode.el.
+
 2013-06-22  Ulrich Müller  <ulm@gentoo.org>
 
 	* configure.ac: Update version to 1.3.5.

diff --git a/misc/Makefile.am b/misc/Makefile.am
index 626fe95..1933dee 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,2 +1,2 @@
-EXTRA_DIST = eselect.bashcomp
+EXTRA_DIST = eselect.bashcomp eselect-mode.el
 MAINTAINERCLEANFILES = *~ Makefile.in

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
new file mode 100644
index 0000000..065ee15
--- /dev/null
+++ b/misc/eselect-mode.el
@@ -0,0 +1,129 @@
+;;; eselect-mode.el --- edit eselect files
+
+;; Copyright 2006-2013 Gentoo Foundation
+
+;; Author: Matthew Kennedy <mkennedy@gentoo.org>
+;;	Diego Pettenò <flameeyes@gentoo.org>
+;;	Christian Faulhammer <fauli@gentoo.org>
+;;	Ulrich Müller <ulm@gentoo.org>
+;; Maintainer: <emacs@gentoo.org>
+;; Keywords: languages
+
+;; This file 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 of the License, or
+;; (at your option) any later version.
+
+;; This file 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/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'sh-script)
+(require 'font-lock)
+
+;;; Font-lock.
+
+(defvar eselect-mode-keywords-warn
+  '(("eval")
+    font-lock-warning-face))
+
+(defvar eselect-mode-keywords-core
+  '(("die" "check_do" "do_action" "inherit" "sed")
+    font-lock-type-face))
+
+(defvar eselect-mode-keywords-output
+  '(("write_error_msg" "write_warning_msg" "write_list_start"
+     "write_numbered_list_entry" "write_kv_list_entry"
+     "write_numbered_list" "highlight" "highlight_warning"
+     "highlight_marker" "is_output_mode" "space")
+    font-lock-type-face))
+
+(defvar eselect-mode-keywords-tests
+  '(("has" "is_function" "is_number")
+    font-lock-type-face))
+
+(defvar eselect-mode-keywords-path-manipulation
+  '(("basename" "dirname" "canonicalise" "relative_name")
+    font-lock-type-face))
+
+(defvar eselect-mode-keywords-config
+  '(("store_config" "load_config" "append_config")
+    font-lock-type-face))
+
+(defvar eselect-mode-keywords-multilib
+  '(("list_libdirs")
+    font-lock-type-face))
+
+(defvar eselect-mode-keywords-package-manager
+  '(("arch" "envvar" "best_version" "has_version" "get_repositories"
+     "get_repo_news_dir")
+    font-lock-type-face))
+
+(defun eselect-mode-make-keywords-list (keywords-list face
+						      &optional prefix suffix)
+  ;; based on `generic-make-keywords-list' from generic.el
+  ;; Note: XEmacs doesn't have generic.el
+  (unless (listp keywords-list)
+    (error "Keywords argument must be a list of strings"))
+  (cons (concat prefix "\\<"
+		(regexp-opt keywords-list t)
+		"\\>" suffix)
+	face))
+
+(defvar eselect-mode-font-lock-keywords
+  (mapcar
+   (lambda (x) (apply 'eselect-mode-make-keywords-list x))
+   (list
+    eselect-mode-keywords-warn
+    eselect-mode-keywords-core
+    eselect-mode-keywords-output
+    eselect-mode-keywords-tests
+    eselect-mode-keywords-path-manipulation
+    eselect-mode-keywords-config
+    eselect-mode-keywords-multilib
+    eselect-mode-keywords-package-manager)))
+
+;;; Mode definitions.
+
+(defun eselect-mode-before-save ()
+  ;;(delete-trailing-whitespace)	; doesn't exist in XEmacs
+  (save-excursion
+    (goto-char (point-min))
+    (while (re-search-forward "[ \t]+$" nil t)
+      (delete-region (match-beginning 0) (point))))
+  ;; return nil, otherwise the file is presumed to be written
+  nil)
+
+;;;###autoload
+(define-derived-mode eselect-mode shell-script-mode "Eselect"
+  "Major mode for .eselect files."
+  (if (featurep 'xemacs)
+      (make-local-hook 'write-contents-hooks))
+  (add-hook 'write-contents-hooks 'eselect-mode-before-save t t)
+  (sh-set-shell "bash")
+  (setq tab-width 4)
+  (setq indent-tabs-mode t))
+
+(add-hook 'eselect-mode-hook
+	  (lambda () (font-lock-add-keywords
+		      nil eselect-mode-font-lock-keywords)))
+
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.eselect\\'" . eselect-mode))
+
+(provide 'eselect-mode)
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;;; eselect-mode.el ends here

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Mueller]

commit:     3fb31ae2151785a683df726821ce81e0609b43b3
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 07:09:42 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 07:09:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=3fb31ae2

Add env_update to eselect-mode keywords.

* misc/eselect-mode.el (eselect-mode-keywords-package-manager):
Add env_update.

---
 ChangeLog            | 5 +++++
 misc/eselect-mode.el | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c62e1c0..edb8af3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-18  Ulrich Müller  <ulm@gentoo.org>
+
+	* misc/eselect-mode.el (eselect-mode-keywords-package-manager):
+	Add env_update.
+
 2013-08-28  Ulrich Müller  <ulm@gentoo.org>
 
 	* configure.ac: Update version to 1.3.8.

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index 3515319..78142dd 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -66,7 +66,7 @@
 
 (defvar eselect-mode-keywords-package-manager
   '(("arch" "envvar" "best_version" "has_version" "get_repositories"
-     "get_repo_news_dir")
+     "get_repo_news_dir" "env_update")
     font-lock-type-face))
 
 (defun eselect-mode-make-keywords-list (keywords-list face

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Müller]

commit:     14c4d2723db87329d23f40a7ed67cb44f9ced7fd
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 06:19:05 2013 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 06:19:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=14c4d272

Enable bash completion also for an empty list of words.

* misc/eselect.bashcomp (_eselect): Suggest possible completions
also for an empty list of words, i.e. when the user has not typed
any parameters yet.

---
 ChangeLog             | 6 ++++++
 misc/eselect.bashcomp | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89fe111..16e368f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-15  Ulrich Müller  <ulm@gentoo.org>
+
+	* misc/eselect.bashcomp (_eselect): Suggest possible completions
+	also for an empty list of words, i.e. when the user has not typed
+	any parameters yet.
+
 2013-11-14  Michael Marineau  <mike@marineau.org>
 
 	* modules/profile.eselect (set_symlink): Silence profile symlink

diff --git a/misc/eselect.bashcomp b/misc/eselect.bashcomp
index 30972fe..0ffe628 100644
--- a/misc/eselect.bashcomp
+++ b/misc/eselect.bashcomp
@@ -13,18 +13,18 @@ _eselect() {
     sedcmd2='s/^  \([[:alnum:]-][[:alnum:]_-]*\)[[:space:],].*$/\1/p'
     sedcmd3='s/^  \[[[:digit:]][[:digit:]]*\] *\([[:graph:]]*\).*$/\1/p'
 
-    set - "${COMP_WORDS[@]:1}"
+    set -- "${COMP_WORDS[@]:1}"
     # skip global options
     while [[ $# -gt 1 && $1 == -* ]]; do
         shift
     done
     # skip any subaction options
     while [[ $# -gt 3 && $3 == -* ]]; do
-        set - "${@:1:2}" "${@:4}"
+        set -- "${@:1:2}" "${@:4}"
     done
 
     case $# in
-        1) possibles="${options} $(eselect --brief modules list 2>/dev/null)"
+        0|1) possibles="${options} $(eselect --brief modules list 2>/dev/null)"
             ;;
         2) possibles=$(eselect --brief "$1" usage 2>/dev/null \
             | sed -n -e "${sedcmd2}") ;;

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Müller]

commit:     5df2ce07583dc623dd6b6caec17d9e73bfb47e1d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  5 11:21:31 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  5 11:21:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=5df2ce07

eselect.bashcomp: Improve handling of options followed by an equals sign.

* misc/eselect.bashcomp (_eselect): Improve handling of options
that are followed by an equals sign.

---
 ChangeLog             | 3 +++
 misc/eselect.bashcomp | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c3f0061..1f01c16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-06-05  Ulrich Müller  <ulm@gentoo.org>
 
+	* misc/eselect.bashcomp (_eselect): Improve handling of options
+	that are followed by an equals sign.
+
 	* bin/eselect.in: Parse global options even if we are invoked
 	as something-config or similar. Respect "--" to indicate end
 	of options.

diff --git a/misc/eselect.bashcomp b/misc/eselect.bashcomp
index da3e55b..bd5afe3 100644
--- a/misc/eselect.bashcomp
+++ b/misc/eselect.bashcomp
@@ -8,7 +8,7 @@
 
 _eselect() {
     local cur sedcmd2 sedcmd3 possibles
-    local options="--brief --color --colour"
+    local options="--brief --color= --colour="
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     sedcmd2='s/^  \([[:alnum:]-][[:alnum:]_-]*\)[[:space:],].*$/\1/p'
@@ -17,6 +17,7 @@ _eselect() {
     set -- "${COMP_WORDS[@]:1}"
     # skip global options
     while [[ $# -gt 1 && $1 == -* ]]; do
+        [[ $2 == "=" ]] && shift 2
         shift
     done
     # skip any subaction options
@@ -38,8 +39,10 @@ _eselect() {
             ;;
     esac
 
-    [[ -n "${possibles}" ]] && \
+    if [[ -n "${possibles}" ]]; then
         COMPREPLY=( $(compgen -W "${possibles}" -- ${cur}) )
+        [[ ${COMPREPLY[0]} == *= ]] && compopt -o nospace
+    fi
 
     return 0
 }

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Müller]

commit:     03dd0b50c278ae49bfcae50fb53eb7fb42ca3829
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May  1 17:32:10 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May  1 17:32:10 2022 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=03dd0b50

eselect-mode: Remove eselect-mode-make-keywords-list function

* misc/eselect-mode.el (eselect-mode-make-keywords-list): Remove.
(eselect-mode-font-lock-keywords): Inline its code. \< \> around
a regexp can be obtained via the paren option of regexp-opt.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog            |  3 +++
 misc/eselect-mode.el | 15 +++------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ef1610..6fcf0db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 	write-contents-functions instead of obsolete write-contents-hooks.
 	(eselect-mode-before-save): Call delete-trailing-whitespace which
 	exists in XEmacs 21.5.
+	(eselect-mode-make-keywords-list): Remove function.
+	(eselect-mode-font-lock-keywords): Inline its code. \< \> around
+	a regexp can be obtained via the paren option of regexp-opt.
 
 2022-01-08  Ulrich Müller  <ulm@gentoo.org>
 

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index 3bdac81..d7ea649 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -69,20 +69,11 @@
      "get_repo_news_dir" "env_update")
     font-lock-type-face))
 
-(defun eselect-mode-make-keywords-list (keywords-list face
-						      &optional prefix suffix)
-  ;; based on `generic-make-keywords-list' from generic.el
-  ;; Note: XEmacs doesn't have generic.el
-  (unless (listp keywords-list)
-    (error "Keywords argument must be a list of strings"))
-  (cons (concat prefix "\\<"
-		(regexp-opt keywords-list t)
-		"\\>" suffix)
-	face))
-
 (defvar eselect-mode-font-lock-keywords
   (mapcar
-   (lambda (x) (apply 'eselect-mode-make-keywords-list x))
+   (lambda (x)
+     (cons (regexp-opt (car x) 'words)
+	   (cadr x)))
    (list
     eselect-mode-keywords-warn
     eselect-mode-keywords-core

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Müller]

commit:     197e833501a270c0f828eb097eacb14679ae1ba2
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May  1 17:11:21 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May  1 17:11:21 2022 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=197e8335

Fix a byte-compile warning in eselect-mode

* misc/eselect-mode.el (eselect-mode): For GNU Emacs, use
write-contents-functions instead of obsolete write-contents-hooks.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog            | 5 +++++
 misc/eselect-mode.el | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8089935..83b0289 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-05-01  Ulrich Müller  <ulm@gentoo.org>
+
+	* misc/eselect-mode.el (eselect-mode): For GNU Emacs, use
+	write-contents-functions instead of obsolete write-contents-hooks.
+
 2022-01-08  Ulrich Müller  <ulm@gentoo.org>
 
 	* configure.ac: Update version to 1.4.20.

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index 667411b..50e88d6 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -1,6 +1,6 @@
 ;;; eselect-mode.el --- edit eselect files
 
-;; Copyright 2006-2020 Gentoo Authors
+;; Copyright 2006-2022 Gentoo Authors
 
 ;; Author: Matthew Kennedy <mkennedy@gentoo.org>
 ;;	Diego Pettenò <flameeyes@gentoo.org>
@@ -107,9 +107,10 @@
 ;;;###autoload
 (define-derived-mode eselect-mode shell-script-mode "Eselect"
   "Major mode for .eselect files."
-  (if (featurep 'xemacs)
-      (make-local-hook 'write-contents-hooks))
-  (add-hook 'write-contents-hooks 'eselect-mode-before-save t t)
+  (if (not (featurep 'xemacs))
+      (add-hook 'write-contents-functions 'eselect-mode-before-save t t)
+    (make-local-hook 'write-contents-hooks)
+    (add-hook 'write-contents-hooks 'eselect-mode-before-save t t))
   (sh-set-shell "bash")
   (setq tab-width 4)
   (setq indent-tabs-mode t))

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Müller]

commit:     3ac9bf6ea721335a5ad7e6d924cb3a5950a8ac13
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 17:11:25 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 17:11:25 2023 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=3ac9bf6e

Update option list in bash completion

* misc/eselect.bashcomp (_eselect): Add --eprefix and --root
options.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog             | 5 +++++
 misc/eselect.bashcomp | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b442b8b..141e377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-02-27  Ulrich Müller  <ulm@gentoo.org>
+
+	* misc/eselect.bashcomp (_eselect): Add --eprefix and --root
+	options.
+
 2023-02-26  Ulrich Müller  <ulm@gentoo.org>
 
 	* bin/eselect.in: New global option --eprefix.

diff --git a/misc/eselect.bashcomp b/misc/eselect.bashcomp
index 7e33285..3ef614e 100644
--- a/misc/eselect.bashcomp
+++ b/misc/eselect.bashcomp
@@ -1,5 +1,5 @@
 # -*- mode: sh; indent-tabs-mode: nil; -*-  vim: set ft=sh tw=80 sw=4 et :
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2023 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 # bash command-line completion for eselect
@@ -8,7 +8,7 @@
 
 _eselect() {
     local cur sedcmd2 sedcmd3 possibles
-    local options="--brief --color= --colour="
+    local options="--brief --color= --colour= --eprefix= --root="
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     sedcmd2='s/^  \([[:alnum:]-][[:alnum:]_-]*\)[[:space:],].*$/\1/p'

[gentoo-commits] proj/eselect:master commit in: /, misc/

[Ulrich Müller]

commit:     b2ae3184ccfcb1ff932f207ca432ebbf964de0c1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 15:51:59 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 15:51:59 2023 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=b2ae3184

eselect-mode: Drop XEmacs compatibility code

* misc/eselect-mode.el (eselect-mode): Drop XEmacs compatibility
code.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog            | 3 +++
 misc/eselect-mode.el | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd75fe3..a5532ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-06-12  Ulrich Müller  <ulm@gentoo.org>
 
+	* misc/eselect-mode.el (eselect-mode): Drop XEmacs compatibility
+	code.
+
 	* misc/eselect-mode.el (eselect, eselect-mode-fix-whitespace)
 	(eselect-mode-update-copyright): New custom group and variables.
 	(eselect-mode-copyright-regexp): New variable.

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index d2df858..bfcf494 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -143,10 +143,7 @@
 ;;;###autoload
 (define-derived-mode eselect-mode shell-script-mode "Eselect"
   "Major mode for .eselect files."
-  (if (not (featurep 'xemacs))
-      (add-hook 'write-contents-functions 'eselect-mode-before-save t t)
-    (make-local-hook 'write-contents-hooks)
-    (add-hook 'write-contents-hooks 'eselect-mode-before-save t t))
+  (add-hook 'write-contents-functions 'eselect-mode-before-save t t)
   (sh-set-shell "bash")
   (setq tab-width 4)
   (setq indent-tabs-mode t))