From 2136dd551ac21455fc7dcee43d0e4ec79fa05c3f Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sat, 30 Jan 2016 06:53:04 +0900 Subject: [PATCH] snippet: Fix for older pcase --- gnome-c-snippet.el | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gnome-c-snippet.el b/gnome-c-snippet.el index 86dbae3d8..d720c76b3 100644 --- a/gnome-c-snippet.el +++ b/gnome-c-snippet.el @@ -126,14 +126,17 @@ (nreverse capitalized-class))))) (defun gnome-c-snippet--find-header-buffer () - (when (equal (file-name-extension buffer-file-name) "c") - (let ((header-file-name - (concat (file-name-sans-extension buffer-file-name) ".h"))) - (cl-find-if - (lambda (buffer) - (with-current-buffer buffer - (equal buffer-file-name header-file-name))) - (buffer-list))))) + (pcase (file-name-extension buffer-file-name) + ("h" + (current-buffer)) + ("c" + (let ((header-file-name + (concat (file-name-sans-extension buffer-file-name) ".h"))) + (cl-find-if + (lambda (buffer) + (with-current-buffer buffer + (equal buffer-file-name header-file-name))) + (buffer-list)))))) (defun gnome-c-snippet--guess-name-from-header-buffer (symbol) (let ((header-buffer (gnome-c-snippet--find-header-buffer))) @@ -154,8 +157,8 @@ region)) (when names (pcase symbol - ('package (car names)) - ('class (nth 1 names))))))))))) + (`package (car names)) + (`class (nth 1 names))))))))))) (defun gnome-c-snippet--guess-name-from-file-name (symbol) (when (memq symbol '(package class)) @@ -164,8 +167,8 @@ (when (string-match-p "-" filename) (let ((names (split-string filename "-"))) (pcase symbol - ('package (list (upcase-initials (car names)))) - ('class (mapcar #'upcase-initials (cdr names))))))))) + (`package (list (upcase-initials (car names)))) + (`class (mapcar #'upcase-initials (cdr names))))))))) (defun gnome-c-snippet--parse-name (name) (with-temp-buffer -- 2.39.2