From a3720aa275043aa5ee0f14c8a342183d293d6ae7 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 14 Aug 2011 11:08:02 +0200 Subject: [PATCH] Follow variable naming convention * src/gnutls.c (QCgnutls_bootprop_priority) (QCgnutls_bootprop_trustfiles, QCgnutls_bootprop_keylist) (QCgnutls_bootprop_crlfiles, QCgnutls_bootprop_callbacks) (QCgnutls_bootprop_loglevel, QCgnutls_bootprop_hostname) (QCgnutls_bootprop_min_prime_bits, QCgnutls_bootprop_verify_flags) (QCgnutls_bootprop_verify_hostname_error) (QCgnutls_bootprop_callbacks_verify): Rename from Qgnutls_bootprop_..., all uses changed. * src/xfaces.c (QCignore_defface): Rename from Qignore_defface, all uses changed. --- src/ChangeLog | 14 +++++++++++ src/gnutls.c | 66 +++++++++++++++++++++++++-------------------------- src/xfaces.c | 12 +++++----- 3 files changed, 53 insertions(+), 39 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1e18ffd5d6b..4b0ac4082a5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +2011-08-14 Andreas Schwab + + * gnutls.c (QCgnutls_bootprop_priority) + (QCgnutls_bootprop_trustfiles, QCgnutls_bootprop_keylist) + (QCgnutls_bootprop_crlfiles, QCgnutls_bootprop_callbacks) + (QCgnutls_bootprop_loglevel, QCgnutls_bootprop_hostname) + (QCgnutls_bootprop_min_prime_bits, QCgnutls_bootprop_verify_flags) + (QCgnutls_bootprop_verify_hostname_error) + (QCgnutls_bootprop_callbacks_verify): Rename from + Qgnutls_bootprop_..., all uses changed. + + * xfaces.c (QCignore_defface): Rename from Qignore_defface, all + uses changed. + 2011-08-14 Paul Eggert * xfaces.c (Qframe_set_background_mode): Now static. diff --git a/src/gnutls.c b/src/gnutls.c index 62382abc437..0743ef3f4ee 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -42,19 +42,19 @@ static Lisp_Object Qgnutls_e_interrupted, Qgnutls_e_again, static int gnutls_global_initialized; /* The following are for the property list of `gnutls-boot'. */ -static Lisp_Object Qgnutls_bootprop_priority; -static Lisp_Object Qgnutls_bootprop_trustfiles; -static Lisp_Object Qgnutls_bootprop_keylist; -static Lisp_Object Qgnutls_bootprop_crlfiles; -static Lisp_Object Qgnutls_bootprop_callbacks; -static Lisp_Object Qgnutls_bootprop_loglevel; -static Lisp_Object Qgnutls_bootprop_hostname; -static Lisp_Object Qgnutls_bootprop_min_prime_bits; -static Lisp_Object Qgnutls_bootprop_verify_flags; -static Lisp_Object Qgnutls_bootprop_verify_hostname_error; +static Lisp_Object QCgnutls_bootprop_priority; +static Lisp_Object QCgnutls_bootprop_trustfiles; +static Lisp_Object QCgnutls_bootprop_keylist; +static Lisp_Object QCgnutls_bootprop_crlfiles; +static Lisp_Object QCgnutls_bootprop_callbacks; +static Lisp_Object QCgnutls_bootprop_loglevel; +static Lisp_Object QCgnutls_bootprop_hostname; +static Lisp_Object QCgnutls_bootprop_min_prime_bits; +static Lisp_Object QCgnutls_bootprop_verify_flags; +static Lisp_Object QCgnutls_bootprop_verify_hostname_error; /* Callback keys for `gnutls-boot'. Unused currently. */ -static Lisp_Object Qgnutls_bootprop_callbacks_verify; +static Lisp_Object QCgnutls_bootprop_callbacks_verify; static void gnutls_log_function (int, const char *); static void gnutls_log_function2 (int, const char*, const char*); @@ -716,17 +716,17 @@ one trustfile (usually a CA bundle). */) return gnutls_make_error (GNUTLS_EMACS_ERROR_NOT_LOADED); } - hostname = Fplist_get (proplist, Qgnutls_bootprop_hostname); - priority_string = Fplist_get (proplist, Qgnutls_bootprop_priority); - trustfiles = Fplist_get (proplist, Qgnutls_bootprop_trustfiles); - keylist = Fplist_get (proplist, Qgnutls_bootprop_keylist); - crlfiles = Fplist_get (proplist, Qgnutls_bootprop_crlfiles); - /* callbacks = Fplist_get (proplist, Qgnutls_bootprop_callbacks); */ - loglevel = Fplist_get (proplist, Qgnutls_bootprop_loglevel); - verify_flags = Fplist_get (proplist, Qgnutls_bootprop_verify_flags); - /* verify_error = Fplist_get (proplist, Qgnutls_bootprop_verify_error); */ - verify_hostname_error = Fplist_get (proplist, Qgnutls_bootprop_verify_hostname_error); - prime_bits = Fplist_get (proplist, Qgnutls_bootprop_min_prime_bits); + hostname = Fplist_get (proplist, QCgnutls_bootprop_hostname); + priority_string = Fplist_get (proplist, QCgnutls_bootprop_priority); + trustfiles = Fplist_get (proplist, QCgnutls_bootprop_trustfiles); + keylist = Fplist_get (proplist, QCgnutls_bootprop_keylist); + crlfiles = Fplist_get (proplist, QCgnutls_bootprop_crlfiles); + /* callbacks = Fplist_get (proplist, QCgnutls_bootprop_callbacks); */ + loglevel = Fplist_get (proplist, QCgnutls_bootprop_loglevel); + verify_flags = Fplist_get (proplist, QCgnutls_bootprop_verify_flags); + /* verify_error = Fplist_get (proplist, QCgnutls_bootprop_verify_error); */ + verify_hostname_error = Fplist_get (proplist, QCgnutls_bootprop_verify_hostname_error); + prime_bits = Fplist_get (proplist, QCgnutls_bootprop_min_prime_bits); if (!STRINGP (hostname)) error ("gnutls-boot: invalid :hostname parameter"); @@ -1119,17 +1119,17 @@ syms_of_gnutls (void) DEFSYM (Qgnutls_code, "gnutls-code"); DEFSYM (Qgnutls_anon, "gnutls-anon"); DEFSYM (Qgnutls_x509pki, "gnutls-x509pki"); - DEFSYM (Qgnutls_bootprop_hostname, ":hostname"); - DEFSYM (Qgnutls_bootprop_priority, ":priority"); - DEFSYM (Qgnutls_bootprop_trustfiles, ":trustfiles"); - DEFSYM (Qgnutls_bootprop_keylist, ":keylist"); - DEFSYM (Qgnutls_bootprop_crlfiles, ":crlfiles"); - DEFSYM (Qgnutls_bootprop_callbacks, ":callbacks"); - DEFSYM (Qgnutls_bootprop_callbacks_verify, "verify"); - DEFSYM (Qgnutls_bootprop_min_prime_bits, ":min-prime-bits"); - DEFSYM (Qgnutls_bootprop_loglevel, ":loglevel"); - DEFSYM (Qgnutls_bootprop_verify_flags, ":verify-flags"); - DEFSYM (Qgnutls_bootprop_verify_hostname_error, ":verify-hostname-error"); + DEFSYM (QCgnutls_bootprop_hostname, ":hostname"); + DEFSYM (QCgnutls_bootprop_priority, ":priority"); + DEFSYM (QCgnutls_bootprop_trustfiles, ":trustfiles"); + DEFSYM (QCgnutls_bootprop_keylist, ":keylist"); + DEFSYM (QCgnutls_bootprop_crlfiles, ":crlfiles"); + DEFSYM (QCgnutls_bootprop_callbacks, ":callbacks"); + DEFSYM (QCgnutls_bootprop_callbacks_verify, "verify"); + DEFSYM (QCgnutls_bootprop_min_prime_bits, ":min-prime-bits"); + DEFSYM (QCgnutls_bootprop_loglevel, ":loglevel"); + DEFSYM (QCgnutls_bootprop_verify_flags, ":verify-flags"); + DEFSYM (QCgnutls_bootprop_verify_hostname_error, ":verify-hostname-error"); DEFSYM (Qgnutls_e_interrupted, "gnutls-e-interrupted"); Fput (Qgnutls_e_interrupted, Qgnutls_code, diff --git a/src/xfaces.c b/src/xfaces.c index ae78a67519f..83c92cdbc52 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -293,7 +293,7 @@ along with GNU Emacs. If not, see . */ /* Non-zero if face attribute ATTR is `ignore-defface'. */ -#define IGNORE_DEFFACE_P(ATTR) EQ ((ATTR), Qignore_defface) +#define IGNORE_DEFFACE_P(ATTR) EQ ((ATTR), QCignore_defface) /* Value is the number of elements of VECTOR. */ @@ -332,7 +332,7 @@ static Lisp_Object Qultra_expanded; static Lisp_Object Qreleased_button, Qpressed_button; static Lisp_Object QCstyle, QCcolor, QCline_width; Lisp_Object Qunspecified; /* used in dosfns.c */ -static Lisp_Object Qignore_defface; +static Lisp_Object QCignore_defface; char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; @@ -2853,7 +2853,7 @@ FRAME 0 means change the face on all frames, and change the default The value of that attribute will be inherited from some other face during face merging. See internal_merge_in_global_face. */ if (UNSPECIFIEDP (value)) - value = Qignore_defface; + value = QCignore_defface; } else { @@ -3651,7 +3651,7 @@ the only relative value that users see is `unspecified'. However, for :height, floating point values are also relative. */) (Lisp_Object attribute, Lisp_Object value) { - if (EQ (value, Qunspecified) || (EQ (value, Qignore_defface))) + if (EQ (value, Qunspecified) || (EQ (value, QCignore_defface))) return Qt; else if (EQ (attribute, QCheight)) return INTEGERP (value) ? Qnil : Qt; @@ -3666,7 +3666,7 @@ If VALUE1 or VALUE2 are absolute (see `face-attribute-relative-p'), then the result will be absolute, otherwise it will be relative. */) (Lisp_Object attribute, Lisp_Object value1, Lisp_Object value2) { - if (EQ (value1, Qunspecified) || EQ (value1, Qignore_defface)) + if (EQ (value1, Qunspecified) || EQ (value1, QCignore_defface)) return value2; else if (EQ (attribute, QCheight)) return merge_face_heights (value1, value2, value1); @@ -6484,7 +6484,7 @@ syms_of_xfaces (void) DEFSYM (Qbackground_color, "background-color"); DEFSYM (Qforeground_color, "foreground-color"); DEFSYM (Qunspecified, "unspecified"); - DEFSYM (Qignore_defface, ":ignore-defface"); + DEFSYM (QCignore_defface, ":ignore-defface"); DEFSYM (Qface_alias, "face-alias"); DEFSYM (Qdefault, "default"); -- 2.39.2