Audio/AudioControl: Allow muting mixer channels from config.py

Emacs/cc-ide: Fix template specialization support
Emacs/cc-ide: Add missing .ih include to .cci file
Shell: Add latex2png tool with alpha-transparency support.

diff --git a/cc-ide/cc-helper.el b/cc-ide/cc-helper.el
index 5d6d701..dfec932 100644 (file)
--- a/cc-ide/cc-helper.el
+++ b/cc-ide/cc-helper.el
@@ -51,21 +51,23 @@
              (set-buffer cbuf)
              (save-excursion
                (goto-char (car template))
-               (concat "template <"
-                       (loop for arg in (c-parse-template-declaration)
-                             for sep = "" then ", "
-                             concat sep
-                             concat (progn
-                                      (buffer-substring-no-properties
-                                       (car arg) (if (c-move-to-initializer 
-                                                      (car arg) (cdr arg))
-                                                     (progn 
-                                                       (forward-char -1)
-                                                       (c-backward-syntactic-ws)
-                                                       (point))
-                                                   (cdr arg)))))
-                       ">"))))
-       do (insert "\n")))
+               (let ((args (c-parse-template-declaration)))
+                 (if args
+                     (concat "template <"
+                             (loop for arg in args
+                                   for sep = "" then ", "
+                                   concat sep
+                                   concat (progn
+                                            (buffer-substring-no-properties
+                                             (car arg) (if (c-move-to-initializer 
+                                                            (car arg) (cdr arg))
+                                                           (progn 
+                                                             (forward-char -1)
+                                                             (c-backward-syntactic-ws)
+                                                             (point))
+                                                         (cdr arg)))))
+                             ">\n")
+                   "")))))))
 
 (defun c-build-defun (&optional add-words no-kill)
   ;; build a function definition header for the current defun. if

diff --git a/cc-ide/cc-ide.el b/cc-ide/cc-ide.el
index 50c1778..a36db47 100644 (file)
--- a/cc-ide/cc-ide.el
+++ b/cc-ide/cc-ide.el
@@ -319,6 +319,7 @@ correctly included.")
          ((string-match "\\.cci$" (buffer-file-name))
           (insert "/** \\file\n"
                   "    \\brief " (ccide-file-name) " inline non-template implementation */\n\n"
+                  "//#include \"" (ccide-file-name ".ih") "\"\n\n"
                    "// Custom includes\n\n"
                   "#define prefix_ inline\n"
                    "///////////////////////////////cci.p///////////////////////////////////////\n\n")